214 files changed, 31503 insertions, 32195 deletions

diff --git a/src/.unitize/_CameraInternals.c b/src/.unitize/_CameraInternals.c
index e727840..4b84aa5 100644
--- a/src/.unitize/_CameraInternals.c
+++ b/src/.unitize/_CameraInternals.c
@@ -1,4 +1,4 @@
-/* _CameraInternals.c generated by valac 0.34.2, the Vala compiler
+/* _CameraInternals.c generated by valac 0.32.1, 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 2d5e5f7..d7eb0e4 100644
--- a/src/.unitize/_ConfigInternals.c
+++ b/src/.unitize/_ConfigInternals.c
@@ -1,4 +1,4 @@
-/* _ConfigInternals.c generated by valac 0.34.2, the Vala compiler
+/* _ConfigInternals.c generated by valac 0.32.1, 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 9ad8313..f95207a 100644
--- a/src/.unitize/_CoreInternals.c
+++ b/src/.unitize/_CoreInternals.c
@@ -1,4 +1,4 @@
-/* _CoreInternals.c generated by valac 0.34.2, the Vala compiler
+/* _CoreInternals.c generated by valac 0.32.1, 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 3eb333f..2d2fc94 100644
--- a/src/.unitize/_DataImportsInternals.c
+++ b/src/.unitize/_DataImportsInternals.c
@@ -1,4 +1,4 @@
-/* _DataImportsInternals.c generated by valac 0.34.2, the Vala compiler
+/* _DataImportsInternals.c generated by valac 0.32.1, 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 0290569..47e29a8 100644
--- a/src/.unitize/_DbInternals.c
+++ b/src/.unitize/_DbInternals.c
@@ -1,4 +1,4 @@
-/* _DbInternals.c generated by valac 0.34.2, the Vala compiler
+/* _DbInternals.c generated by valac 0.32.1, 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 208cbb6..2095fcb 100644
--- a/src/.unitize/_DirectInternals.c
+++ b/src/.unitize/_DirectInternals.c
@@ -1,4 +1,4 @@
-/* _DirectInternals.c generated by valac 0.34.2, the Vala compiler
+/* _DirectInternals.c generated by valac 0.32.1, 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 308750f..148e461 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.2, the Vala compiler
+/* _Direct_unitize_entry.c generated by valac 0.32.1, 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 523ca8a..5f351af 100644
--- a/src/.unitize/_EditingToolsInternals.c
+++ b/src/.unitize/_EditingToolsInternals.c
@@ -1,4 +1,4 @@
-/* _EditingToolsInternals.c generated by valac 0.34.2, the Vala compiler
+/* _EditingToolsInternals.c generated by valac 0.32.1, 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 587b091..33088f7 100644
--- a/src/.unitize/_EventsInternals.c
+++ b/src/.unitize/_EventsInternals.c
@@ -1,4 +1,4 @@
-/* _EventsInternals.c generated by valac 0.34.2, the Vala compiler
+/* _EventsInternals.c generated by valac 0.32.1, 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 342563f..1a3988e 100644
--- a/src/.unitize/_FoldersInternals.c
+++ b/src/.unitize/_FoldersInternals.c
@@ -1,4 +1,4 @@
-/* _FoldersInternals.c generated by valac 0.34.2, the Vala compiler
+/* _FoldersInternals.c generated by valac 0.32.1, 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 58d4f47..6d70073 100644
--- a/src/.unitize/_LibraryInternals.c
+++ b/src/.unitize/_LibraryInternals.c
@@ -1,4 +1,4 @@
-/* _LibraryInternals.c generated by valac 0.34.2, the Vala compiler
+/* _LibraryInternals.c generated by valac 0.32.1, 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 910f94f..8e7246c 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.2, the Vala compiler
+/* _Library_unitize_entry.c generated by valac 0.32.1, 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 7166991..3710e7b 100644
--- a/src/.unitize/_PhotosInternals.c
+++ b/src/.unitize/_PhotosInternals.c
@@ -1,4 +1,4 @@
-/* _PhotosInternals.c generated by valac 0.34.2, the Vala compiler
+/* _PhotosInternals.c generated by valac 0.32.1, 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 cd6a451..9a9ee42 100644
--- a/src/.unitize/_PluginsInternals.c
+++ b/src/.unitize/_PluginsInternals.c
@@ -1,4 +1,4 @@
-/* _PluginsInternals.c generated by valac 0.34.2, the Vala compiler
+/* _PluginsInternals.c generated by valac 0.32.1, 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 639a43e..b1d0861 100644
--- a/src/.unitize/_PublishingInternals.c
+++ b/src/.unitize/_PublishingInternals.c
@@ -1,4 +1,4 @@
-/* _PublishingInternals.c generated by valac 0.34.2, the Vala compiler
+/* _PublishingInternals.c generated by valac 0.32.1, 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 c4258c1..7b0f7e8 100644
--- a/src/.unitize/_SearchesInternals.c
+++ b/src/.unitize/_SearchesInternals.c
@@ -1,4 +1,4 @@
-/* _SearchesInternals.c generated by valac 0.34.2, the Vala compiler
+/* _SearchesInternals.c generated by valac 0.32.1, 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 fb620c2..f312282 100644
--- a/src/.unitize/_SidebarInternals.c
+++ b/src/.unitize/_SidebarInternals.c
@@ -1,4 +1,4 @@
-/* _SidebarInternals.c generated by valac 0.34.2, the Vala compiler
+/* _SidebarInternals.c generated by valac 0.32.1, 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 2f62724..31b8124 100644
--- a/src/.unitize/_SlideshowInternals.c
+++ b/src/.unitize/_SlideshowInternals.c
@@ -1,4 +1,4 @@
-/* _SlideshowInternals.c generated by valac 0.34.2, the Vala compiler
+/* _SlideshowInternals.c generated by valac 0.32.1, 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 52fd320..599fb26 100644
--- a/src/.unitize/_TagsInternals.c
+++ b/src/.unitize/_TagsInternals.c
@@ -1,4 +1,4 @@
-/* _TagsInternals.c generated by valac 0.34.2, the Vala compiler
+/* _TagsInternals.c generated by valac 0.32.1, 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 55c6aa8..69712a7 100644
--- a/src/.unitize/_ThreadsInternals.c
+++ b/src/.unitize/_ThreadsInternals.c
@@ -1,4 +1,4 @@
-/* _ThreadsInternals.c generated by valac 0.34.2, the Vala compiler
+/* _ThreadsInternals.c generated by valac 0.32.1, 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 2d1e534..102107b 100644
--- a/src/.unitize/_UnitInternals.c
+++ b/src/.unitize/_UnitInternals.c
@@ -1,4 +1,4 @@
-/* _UnitInternals.c generated by valac 0.34.2, the Vala compiler
+/* _UnitInternals.c generated by valac 0.32.1, 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 288bc95..ddfb022 100644
--- a/src/.unitize/_UtilInternals.c
+++ b/src/.unitize/_UtilInternals.c
@@ -1,4 +1,4 @@
-/* _UtilInternals.c generated by valac 0.34.2, the Vala compiler
+/* _UtilInternals.c generated by valac 0.32.1, 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 5e4ec30..c120815 100644
--- a/src/AppDirs.c
+++ b/src/AppDirs.c
@@ -1,4 +1,4 @@
-/* AppDirs.c generated by valac 0.34.2, the Vala compiler
+/* AppDirs.c generated by valac 0.32.1, the Vala compiler
  * generated from AppDirs.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -394,11 +394,11 @@ void app_dirs_try_migrate_data (void) {
 #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 397 "AppDirs.c"
-				goto __catch442_g_error;
+				goto __catch440_g_error;
 			}
 		}
-		goto __finally442;
-		__catch442_g_error:
+		goto __finally440;
+		__catch440_g_error:
 		{
 			GError* err = NULL;
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -409,7 +409,7 @@ void app_dirs_try_migrate_data (void) {
 			_g_error_free0 (err);
 #line 411 "AppDirs.c"
 		}
-		__finally442:
+		__finally440:
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -437,11 +437,11 @@ void app_dirs_try_migrate_data (void) {
 #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 440 "AppDirs.c"
-			goto __catch443_g_error;
+			goto __catch441_g_error;
 		}
 	}
-	goto __finally443;
-	__catch443_g_error:
+	goto __finally441;
+	__catch441_g_error:
 	{
 		GError* err = NULL;
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -452,7 +452,7 @@ void app_dirs_try_migrate_data (void) {
 		_g_error_free0 (err);
 #line 454 "AppDirs.c"
 	}
-	__finally443:
+	__finally441:
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -539,11 +539,11 @@ void app_dirs_try_migrate_data (void) {
 #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 542 "AppDirs.c"
-				goto __catch444_g_error;
+				goto __catch442_g_error;
 			}
 		}
-		goto __finally444;
-		__catch444_g_error:
+		goto __finally442;
+		__catch442_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp35_ = NULL;
@@ -584,7 +584,7 @@ void app_dirs_try_migrate_data (void) {
 			_g_error_free0 (err);
 #line 586 "AppDirs.c"
 		}
-		__finally444:
+		__finally442:
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -666,11 +666,11 @@ void app_dirs_try_migrate_data (void) {
 #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 669 "AppDirs.c"
-				goto __catch445_g_error;
+				goto __catch443_g_error;
 			}
 		}
-		goto __finally445;
-		__catch445_g_error:
+		goto __finally443;
+		__catch443_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp61_ = NULL;
@@ -719,7 +719,7 @@ void app_dirs_try_migrate_data (void) {
 			_g_error_free0 (err);
 #line 721 "AppDirs.c"
 		}
-		__finally445:
+		__finally443:
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -895,12 +895,12 @@ void app_dirs_verify_data_dir (void) {
 #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 898 "AppDirs.c"
-				goto __catch446_g_error;
+				goto __catch444_g_error;
 			}
 		}
 	}
-	goto __finally446;
-	__catch446_g_error:
+	goto __finally444;
+	__catch444_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -941,7 +941,7 @@ void app_dirs_verify_data_dir (void) {
 		_g_error_free0 (err);
 #line 943 "AppDirs.c"
 	}
-	__finally446:
+	__finally444:
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -987,12 +987,12 @@ void app_dirs_verify_cache_dir (void) {
 #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 990 "AppDirs.c"
-				goto __catch447_g_error;
+				goto __catch445_g_error;
 			}
 		}
 	}
-	goto __finally447;
-	__catch447_g_error:
+	goto __finally445;
+	__catch445_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -1033,7 +1033,7 @@ void app_dirs_verify_cache_dir (void) {
 		_g_error_free0 (err);
 #line 1035 "AppDirs.c"
 	}
-	__finally447:
+	__finally445:
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1591,12 +1591,12 @@ GFile* app_dirs_get_temp_dir (void) {
 #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1594 "AppDirs.c"
-					goto __catch448_g_error;
+					goto __catch446_g_error;
 				}
 			}
 		}
-		goto __finally448;
-		__catch448_g_error:
+		goto __finally446;
+		__catch446_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp9_ = NULL;
@@ -1637,7 +1637,7 @@ GFile* app_dirs_get_temp_dir (void) {
 			_g_error_free0 (err);
 #line 1639 "AppDirs.c"
 		}
-		__finally448:
+		__finally446:
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1725,12 +1725,12 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1728 "AppDirs.c"
-				goto __catch449_g_error;
+				goto __catch447_g_error;
 			}
 		}
 	}
-	goto __finally449;
-	__catch449_g_error:
+	goto __finally447;
+	__catch447_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp12_ = NULL;
@@ -1771,7 +1771,7 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		_g_error_free0 (err);
 #line 1773 "AppDirs.c"
 	}
-	__finally449:
+	__finally447:
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1825,7 +1825,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1828 "AppDirs.c"
-				goto __catch450_g_error;
+				goto __catch448_g_error;
 			}
 #line 234 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp4_ = info;
@@ -1846,7 +1846,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				_g_object_unref0 (info);
 #line 1849 "AppDirs.c"
-				goto __catch450_g_error;
+				goto __catch448_g_error;
 			}
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (!_tmp6_) {
@@ -1881,8 +1881,8 @@ void app_dirs_ensure_writable (GFile* dir) {
 			_g_object_unref0 (info);
 #line 1883 "AppDirs.c"
 		}
-		goto __finally450;
-		__catch450_g_error:
+		goto __finally448;
+		__catch448_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp16_ = NULL;
@@ -1923,7 +1923,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 			_g_error_free0 (err);
 #line 1925 "AppDirs.c"
 		}
-		__finally450:
+		__finally448:
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2008,12 +2008,12 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2011 "AppDirs.c"
-				goto __catch451_g_error;
+				goto __catch449_g_error;
 			}
 		}
 	}
-	goto __finally451;
-	__catch451_g_error:
+	goto __finally449;
+	__catch449_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp13_ = NULL;
@@ -2054,7 +2054,7 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		_g_error_free0 (err);
 #line 2056 "AppDirs.c"
 	}
-	__finally451:
+	__finally449:
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
diff --git a/src/AppWindow.c b/src/AppWindow.c
index a22d177..e49d245 100644
--- a/src/AppWindow.c
+++ b/src/AppWindow.c
@@ -1,4 +1,4 @@
-/* AppWindow.c generated by valac 0.34.2, the Vala compiler
+/* AppWindow.c generated by valac 0.32.1, the Vala compiler
  * generated from AppWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -235,6 +235,7 @@ typedef struct _DataViewClass DataViewClass;
 
 typedef struct _CheckerboardPage CheckerboardPage;
 typedef struct _CheckerboardPageClass CheckerboardPageClass;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
 
 #define TYPE_COMMAND_DESCRIPTION (command_description_get_type ())
 #define COMMAND_DESCRIPTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND_DESCRIPTION, CommandDescription))
@@ -438,6 +439,8 @@ void value_take_command_manager (GValue* value, gpointer v_object);
 gpointer value_get_command_manager (const GValue* value);
 GType command_manager_get_type (void) G_GNUC_CONST;
 #define APP_WINDOW_DND_ICON_SCALE 128
+void app_window_on_about (AppWindow* self);
+static void _app_window_on_about_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void app_window_on_quit (AppWindow* self);
 static void _app_window_on_quit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void app_window_on_fullscreen (AppWindow* self);
@@ -496,7 +499,6 @@ void app_window_panic (const gchar* msg);
 void application_panic (Application* self);
 gchar* app_window_get_app_role (AppWindow* self);
 static gchar* app_window_real_get_app_role (AppWindow* self);
-void app_window_on_about (AppWindow* self);
 #define RESOURCES_APP_VERSION _VERSION
 #define RESOURCES_COPYRIGHT _ ("Copyright 2016 Software Freedom Conservancy Inc.")
 #define RESOURCES_HOME_URL "https://wiki.gnome.org/Apps/Shotwell"
@@ -575,9 +577,12 @@ GType checkerboard_page_get_type (void) G_GNUC_CONST;
 static void app_window_real_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count);
 void app_window_decorate_undo_action (AppWindow* self);
 void app_window_decorate_redo_action (AppWindow* self);
+void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const gchar* new_label);
+GMenuModel* page_get_menubar (Page* self);
 CommandManager* app_window_get_command_manager (void);
 GType command_description_get_type (void) G_GNUC_CONST;
 static void app_window_decorate_command_manager_action (AppWindow* self, const gchar* name, const gchar* prefix, const gchar* default_explanation, CommandDescription* desc);
+gchar* command_description_get_name (CommandDescription* self);
 #define RESOURCES_UNDO_MENU _ ("_Undo")
 CommandDescription* command_manager_get_undo_description (CommandManager* self);
 #define RESOURCES_REDO_MENU _ ("_Redo")
@@ -590,27 +595,27 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
 static void app_window_finalize (GObject* obj);
 
 static const GActionEntry FULLSCREEN_WINDOW_entries[1] = {{"LeaveFullscreen", _fullscreen_window_on_close_gsimple_action_activate_callback}};
-static const GActionEntry APP_WINDOW_common_actions[10] = {{"CommonQuit", _app_window_on_quit_gsimple_action_activate_callback}, {"CommonFullscreen", _app_window_on_fullscreen_gsimple_action_activate_callback}, {"CommonHelpContents", _app_window_on_help_contents_gsimple_action_activate_callback}, {"CommonHelpFAQ", _app_window_on_help_faq_gsimple_action_activate_callback}, {"CommonHelpReportProblem", _app_window_on_help_report_problem_gsimple_action_activate_callback}, {"CommonUndo", _app_window_on_undo_gsimple_action_activate_callback}, {"CommonRedo", _app_window_on_redo_gsimple_action_activate_callback}, {"CommonJumpToFile", _app_window_on_jump_to_file_gsimple_action_activate_callback}, {"CommonSelectAll", _app_window_on_select_all_gsimple_action_activate_callback}, {"CommonSelectNone", _app_window_on_select_none_gsimple_action_activate_callback}};
+static const GActionEntry APP_WINDOW_common_actions[11] = {{"CommonAbout", _app_window_on_about_gsimple_action_activate_callback}, {"CommonQuit", _app_window_on_quit_gsimple_action_activate_callback}, {"CommonFullscreen", _app_window_on_fullscreen_gsimple_action_activate_callback}, {"CommonHelpContents", _app_window_on_help_contents_gsimple_action_activate_callback}, {"CommonHelpFAQ", _app_window_on_help_faq_gsimple_action_activate_callback}, {"CommonHelpReportProblem", _app_window_on_help_report_problem_gsimple_action_activate_callback}, {"CommonUndo", _app_window_on_undo_gsimple_action_activate_callback}, {"CommonRedo", _app_window_on_redo_gsimple_action_activate_callback}, {"CommonJumpToFile", _app_window_on_jump_to_file_gsimple_action_activate_callback}, {"CommonSelectAll", _app_window_on_select_all_gsimple_action_activate_callback}, {"CommonSelectNone", _app_window_on_select_none_gsimple_action_activate_callback}};
 extern const gchar* RESOURCES_AUTHORS[6];
 
 static void _fullscreen_window_on_close_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_on_close ((FullscreenWindow*) self);
-#line 572 "AppWindow.c"
+#line 577 "AppWindow.c"
 }
 
 
 static void _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 50 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_update_toolbar_dismissal ((FullscreenWindow*) self);
-#line 579 "AppWindow.c"
+#line 584 "AppWindow.c"
 }
 
 
 static void _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar (SlideshowPage* _sender, gpointer self) {
 #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_hide_toolbar ((FullscreenWindow*) self);
-#line 586 "AppWindow.c"
+#line 591 "AppWindow.c"
 }
 
 
@@ -621,7 +626,7 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 	AppWindow* _tmp2_ = NULL;
 #line 32 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	static const gchar* accels[] = {"F11"};
-#line 597 "AppWindow.c"
+#line 602 "AppWindow.c"
 	AppWindow* _tmp3_ = NULL;
 	AppWindow* _tmp4_ = NULL;
 	GdkScreen* _tmp5_ = NULL;
@@ -794,13 +799,13 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 	_tmp33_ = page;
 #line 63 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp33_, TYPE_SLIDESHOW_PAGE)) {
-#line 770 "AppWindow.c"
+#line 775 "AppWindow.c"
 		Page* _tmp34_ = NULL;
 #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp34_ = page;
 #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_SLIDESHOW_PAGE, SlideshowPage), "hide-toolbar", (GCallback) _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar, self, 0);
-#line 776 "AppWindow.c"
+#line 781 "AppWindow.c"
 	} else {
 		GtkToolbar* _tmp35_ = NULL;
 		GtkToggleToolButton* _tmp36_ = NULL;
@@ -810,7 +815,7 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 		_tmp36_ = self->priv->pin_button;
 #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 786 "AppWindow.c"
+#line 791 "AppWindow.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp37_ = page;
@@ -868,14 +873,14 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE);
 #line 26 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self;
-#line 844 "AppWindow.c"
+#line 849 "AppWindow.c"
 }
 
 
 FullscreenWindow* fullscreen_window_new (Page* page) {
 #line 26 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return fullscreen_window_construct (TYPE_FULLSCREEN_WINDOW, page);
-#line 851 "AppWindow.c"
+#line 856 "AppWindow.c"
 }
 
 
@@ -884,7 +889,7 @@ void fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self) {
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
 #line 103 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_dismissal_enabled = FALSE;
-#line 860 "AppWindow.c"
+#line 865 "AppWindow.c"
 }
 
 
@@ -899,7 +904,7 @@ void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self) {
 	_tmp1_ = gtk_toggle_tool_button_get_active (_tmp0_);
 #line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_dismissal_enabled = !_tmp1_;
-#line 875 "AppWindow.c"
+#line 880 "AppWindow.c"
 }
 
 
@@ -936,7 +941,7 @@ static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkR
 	*result = monitor;
 #line 116 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return;
-#line 912 "AppWindow.c"
+#line 917 "AppWindow.c"
 }
 
 
@@ -961,7 +966,7 @@ static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEven
 	_tmp2_ = self->priv->switched_to;
 #line 122 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp2_) {
-#line 937 "AppWindow.c"
+#line 942 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 #line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -974,13 +979,13 @@ static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEven
 		_g_object_unref0 (_tmp4_);
 #line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->priv->switched_to = TRUE;
-#line 950 "AppWindow.c"
+#line 955 "AppWindow.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _result_;
 #line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 956 "AppWindow.c"
+#line 961 "AppWindow.c"
 }
 
 
@@ -1014,11 +1019,11 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 990 "AppWindow.c"
+#line 995 "AppWindow.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event != NULL) {
-#line 994 "AppWindow.c"
+#line 999 "AppWindow.c"
 		GdkEventKey* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1027,11 +1032,11 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
 		_tmp5_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp4_);
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp5_;
-#line 1003 "AppWindow.c"
+#line 1008 "AppWindow.c"
 	} else {
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = FALSE;
-#line 1007 "AppWindow.c"
+#line 1012 "AppWindow.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_) {
@@ -1039,7 +1044,7 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1015 "AppWindow.c"
+#line 1020 "AppWindow.c"
 	}
 #line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = app_window_get_instance ();
@@ -1057,7 +1062,7 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
 	result = _tmp10_;
 #line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1033 "AppWindow.c"
+#line 1038 "AppWindow.c"
 }
 
 
@@ -1089,7 +1094,7 @@ static void fullscreen_window_on_close (FullscreenWindow* self) {
 	app_window_end_fullscreen (_tmp4_);
 #line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1065 "AppWindow.c"
+#line 1070 "AppWindow.c"
 }
 
 
@@ -1098,7 +1103,7 @@ void fullscreen_window_close (FullscreenWindow* self) {
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
 #line 154 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_on_close (self);
-#line 1074 "AppWindow.c"
+#line 1079 "AppWindow.c"
 }
 
 
@@ -1119,7 +1124,7 @@ static void fullscreen_window_real_destroy (GtkWidget* base) {
 	_tmp1_ = page;
 #line 161 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 1095 "AppWindow.c"
+#line 1100 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		Page* _tmp3_ = NULL;
 #line 162 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1130,13 +1135,13 @@ static void fullscreen_window_real_destroy (GtkWidget* base) {
 		_tmp3_ = page;
 #line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_switching_from (_tmp3_);
-#line 1106 "AppWindow.c"
+#line 1111 "AppWindow.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	GTK_WIDGET_CLASS (fullscreen_window_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget));
 #line 157 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 1112 "AppWindow.c"
+#line 1117 "AppWindow.c"
 }
 
 
@@ -1163,7 +1168,7 @@ static gboolean fullscreen_window_real_delete_event (GtkWidget* base, GdkEventAn
 	result = TRUE;
 #line 173 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1139 "AppWindow.c"
+#line 1144 "AppWindow.c"
 }
 
 
@@ -1172,7 +1177,7 @@ static gboolean _fullscreen_window_on_check_toolbar_invocation_gsource_func (gpo
 	result = fullscreen_window_on_check_toolbar_invocation ((FullscreenWindow*) self);
 #line 182 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1148 "AppWindow.c"
+#line 1153 "AppWindow.c"
 }
 
 
@@ -1189,24 +1194,24 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk
 	_tmp0_ = self->priv->is_toolbar_shown;
 #line 177 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp0_) {
-#line 1165 "AppWindow.c"
+#line 1170 "AppWindow.c"
 		gboolean _tmp1_ = FALSE;
 		gboolean _tmp2_ = FALSE;
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = self->priv->waiting_for_invoke;
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (!_tmp2_) {
-#line 1172 "AppWindow.c"
+#line 1177 "AppWindow.c"
 			gboolean _tmp3_ = FALSE;
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp3_ = fullscreen_window_is_pointer_in_toolbar (self);
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp1_ = _tmp3_;
-#line 1178 "AppWindow.c"
+#line 1183 "AppWindow.c"
 		} else {
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp1_ = FALSE;
-#line 1182 "AppWindow.c"
+#line 1187 "AppWindow.c"
 		}
 #line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (_tmp1_) {
@@ -1214,12 +1219,12 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk
 			g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) FULLSCREEN_WINDOW_TOOLBAR_INVOCATION_MSEC, _fullscreen_window_on_check_toolbar_invocation_gsource_func, g_object_ref (self), g_object_unref);
 #line 183 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			self->priv->waiting_for_invoke = TRUE;
-#line 1190 "AppWindow.c"
+#line 1195 "AppWindow.c"
 		}
 	}
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event != NULL) {
-#line 1195 "AppWindow.c"
+#line 1200 "AppWindow.c"
 		GdkEventMotion* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1228,24 +1233,24 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk
 		_tmp6_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp6_;
-#line 1204 "AppWindow.c"
+#line 1209 "AppWindow.c"
 	} else {
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = FALSE;
-#line 1208 "AppWindow.c"
+#line 1213 "AppWindow.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp4_;
 #line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1214 "AppWindow.c"
+#line 1219 "AppWindow.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1221 "AppWindow.c"
+#line 1226 "AppWindow.c"
 }
 
 
@@ -1288,7 +1293,7 @@ static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self)
 		_g_object_unref0 (devmgr);
 #line 195 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1264 "AppWindow.c"
+#line 1269 "AppWindow.c"
 	}
 #line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = devmgr;
@@ -1316,7 +1321,7 @@ static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self)
 	_g_object_unref0 (devmgr);
 #line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1292 "AppWindow.c"
+#line 1297 "AppWindow.c"
 }
 
 
@@ -1336,7 +1341,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
 		result = FALSE;
 #line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1312 "AppWindow.c"
+#line 1317 "AppWindow.c"
 	}
 #line 213 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = fullscreen_window_is_pointer_in_toolbar (self);
@@ -1346,7 +1351,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
 		result = FALSE;
 #line 214 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1322 "AppWindow.c"
+#line 1327 "AppWindow.c"
 	}
 #line 216 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_invoke_toolbar (self);
@@ -1354,7 +1359,7 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
 	result = FALSE;
 #line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1330 "AppWindow.c"
+#line 1335 "AppWindow.c"
 }
 
 
@@ -1363,7 +1368,7 @@ static gboolean _fullscreen_window_on_check_toolbar_dismissal_gsource_func (gpoi
 	result = fullscreen_window_on_check_toolbar_dismissal ((FullscreenWindow*) self);
 #line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1339 "AppWindow.c"
+#line 1344 "AppWindow.c"
 }
 
 
@@ -1379,7 +1384,7 @@ static void fullscreen_window_invoke_toolbar (FullscreenWindow* self) {
 	self->priv->is_toolbar_shown = TRUE;
 #line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) FULLSCREEN_WINDOW_TOOLBAR_CHECK_DISMISSAL_MSEC, _fullscreen_window_on_check_toolbar_dismissal_gsource_func, g_object_ref (self), g_object_unref);
-#line 1355 "AppWindow.c"
+#line 1360 "AppWindow.c"
 }
 
 
@@ -1405,7 +1410,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = FALSE;
 #line 231 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1381 "AppWindow.c"
+#line 1386 "AppWindow.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->priv->is_toolbar_dismissal_enabled;
@@ -1415,7 +1420,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = TRUE;
 #line 235 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1391 "AppWindow.c"
+#line 1396 "AppWindow.c"
 	}
 #line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = fullscreen_window_is_pointer_in_toolbar (self);
@@ -1427,13 +1432,13 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = TRUE;
 #line 241 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1403 "AppWindow.c"
+#line 1408 "AppWindow.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = self->priv->left_toolbar_time;
 #line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ == ((time_t) 0)) {
-#line 1409 "AppWindow.c"
+#line 1414 "AppWindow.c"
 		time_t _tmp4_ = 0;
 #line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = time (NULL);
@@ -1443,7 +1448,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = TRUE;
 #line 248 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1419 "AppWindow.c"
+#line 1424 "AppWindow.c"
 	}
 #line 252 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = time (NULL);
@@ -1465,7 +1470,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 		result = TRUE;
 #line 256 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1441 "AppWindow.c"
+#line 1446 "AppWindow.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_hide_toolbar (self);
@@ -1473,7 +1478,7 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 	result = FALSE;
 #line 260 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1449 "AppWindow.c"
+#line 1454 "AppWindow.c"
 }
 
 
@@ -1487,7 +1492,7 @@ static void fullscreen_window_hide_toolbar (FullscreenWindow* self) {
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
 #line 265 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_shown = FALSE;
-#line 1463 "AppWindow.c"
+#line 1468 "AppWindow.c"
 }
 
 
@@ -1508,7 +1513,7 @@ static void fullscreen_window_class_init (FullscreenWindowClass * klass) {
 	((GtkWidgetClass *) klass)->motion_notify_event = fullscreen_window_real_motion_notify_event;
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = fullscreen_window_finalize;
-#line 1484 "AppWindow.c"
+#line 1489 "AppWindow.c"
 }
 
 
@@ -1546,7 +1551,7 @@ static void fullscreen_window_instance_init (FullscreenWindow * self) {
 	self->priv->left_toolbar_time = (time_t) 0;
 #line 19 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->switched_to = FALSE;
-#line 1522 "AppWindow.c"
+#line 1527 "AppWindow.c"
 }
 
 
@@ -1564,7 +1569,7 @@ static void fullscreen_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->pin_button);
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (fullscreen_window_parent_class)->finalize (obj);
-#line 1540 "AppWindow.c"
+#line 1545 "AppWindow.c"
 }
 
 
@@ -1585,7 +1590,7 @@ static void page_window_real_switched_pages (PageWindow* self, Page* old_page, P
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
 #line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 1561 "AppWindow.c"
+#line 1566 "AppWindow.c"
 }
 
 
@@ -1594,7 +1599,7 @@ void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_pag
 	g_return_if_fail (IS_PAGE_WINDOW (self));
 #line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->switched_pages (self, old_page, new_page);
-#line 1570 "AppWindow.c"
+#line 1575 "AppWindow.c"
 }
 
 
@@ -1624,7 +1629,7 @@ PageWindow* page_window_construct (GType object_type) {
 	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE);
 #line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self;
-#line 1600 "AppWindow.c"
+#line 1605 "AppWindow.c"
 }
 
 
@@ -1642,7 +1647,7 @@ Page* page_window_get_current_page (PageWindow* self) {
 	result = _tmp1_;
 #line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1618 "AppWindow.c"
+#line 1623 "AppWindow.c"
 }
 
 
@@ -1661,13 +1666,13 @@ static void page_window_real_set_current_page (PageWindow* self, Page* page) {
 	_tmp0_ = self->priv->current_page;
 #line 297 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 1637 "AppWindow.c"
+#line 1642 "AppWindow.c"
 		Page* _tmp1_ = NULL;
 #line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->current_page;
 #line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_clear_container (_tmp1_);
-#line 1643 "AppWindow.c"
+#line 1648 "AppWindow.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->current_page;
@@ -1693,7 +1698,7 @@ static void page_window_real_set_current_page (PageWindow* self, Page* page) {
 	page_window_switched_pages (self, old_page, _tmp7_);
 #line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (old_page);
-#line 1669 "AppWindow.c"
+#line 1674 "AppWindow.c"
 }
 
 
@@ -1702,7 +1707,7 @@ void page_window_set_current_page (PageWindow* self, Page* page) {
 	g_return_if_fail (IS_PAGE_WINDOW (self));
 #line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->set_current_page (self, page);
-#line 1678 "AppWindow.c"
+#line 1683 "AppWindow.c"
 }
 
 
@@ -1715,13 +1720,13 @@ static void page_window_real_clear_current_page (PageWindow* self) {
 	_tmp0_ = self->priv->current_page;
 #line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 1691 "AppWindow.c"
+#line 1696 "AppWindow.c"
 		Page* _tmp1_ = NULL;
 #line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->current_page;
 #line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_clear_container (_tmp1_);
-#line 1697 "AppWindow.c"
+#line 1702 "AppWindow.c"
 	}
 #line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->current_page;
@@ -1737,7 +1742,7 @@ static void page_window_real_clear_current_page (PageWindow* self) {
 	page_window_switched_pages (self, old_page, NULL);
 #line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (old_page);
-#line 1713 "AppWindow.c"
+#line 1718 "AppWindow.c"
 }
 
 
@@ -1746,7 +1751,7 @@ void page_window_clear_current_page (PageWindow* self) {
 	g_return_if_fail (IS_PAGE_WINDOW (self));
 #line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->clear_current_page (self);
-#line 1722 "AppWindow.c"
+#line 1727 "AppWindow.c"
 }
 
 
@@ -1766,7 +1771,7 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 	_tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
 #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) {
-#line 1742 "AppWindow.c"
+#line 1747 "AppWindow.c"
 		GtkWidget* _tmp2_ = NULL;
 		GdkEventKey* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -1778,11 +1783,11 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		g_signal_emit_by_name (_tmp2_, "key-press-event", _tmp3_, &_tmp4_);
 #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 1754 "AppWindow.c"
+#line 1759 "AppWindow.c"
 	} else {
 #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 1758 "AppWindow.c"
+#line 1763 "AppWindow.c"
 	}
 #line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
@@ -1790,13 +1795,13 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		result = TRUE;
 #line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1766 "AppWindow.c"
+#line 1771 "AppWindow.c"
 	}
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = self->priv->current_page;
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 1772 "AppWindow.c"
+#line 1777 "AppWindow.c"
 		Page* _tmp7_ = NULL;
 		GdkEventKey* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
@@ -1808,11 +1813,11 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		_tmp9_ = page_notify_app_key_pressed (_tmp7_, _tmp8_);
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp9_;
-#line 1784 "AppWindow.c"
+#line 1789 "AppWindow.c"
 	} else {
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 1788 "AppWindow.c"
+#line 1793 "AppWindow.c"
 	}
 #line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
@@ -1820,11 +1825,11 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		result = TRUE;
 #line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1796 "AppWindow.c"
+#line 1801 "AppWindow.c"
 	}
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event != NULL) {
-#line 1800 "AppWindow.c"
+#line 1805 "AppWindow.c"
 		GdkEventKey* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1833,17 +1838,17 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 		_tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 1809 "AppWindow.c"
+#line 1814 "AppWindow.c"
 	} else {
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = FALSE;
-#line 1813 "AppWindow.c"
+#line 1818 "AppWindow.c"
 	}
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_;
 #line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1819 "AppWindow.c"
+#line 1824 "AppWindow.c"
 }
 
 
@@ -1863,7 +1868,7 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 	_tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
 #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) {
-#line 1839 "AppWindow.c"
+#line 1844 "AppWindow.c"
 		GtkWidget* _tmp2_ = NULL;
 		GdkEventKey* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -1875,11 +1880,11 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		g_signal_emit_by_name (_tmp2_, "key-release-event", _tmp3_, &_tmp4_);
 #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 1851 "AppWindow.c"
+#line 1856 "AppWindow.c"
 	} else {
 #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 1855 "AppWindow.c"
+#line 1860 "AppWindow.c"
 	}
 #line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
@@ -1887,13 +1892,13 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		result = TRUE;
 #line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1863 "AppWindow.c"
+#line 1868 "AppWindow.c"
 	}
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = self->priv->current_page;
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 1869 "AppWindow.c"
+#line 1874 "AppWindow.c"
 		Page* _tmp7_ = NULL;
 		GdkEventKey* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
@@ -1905,11 +1910,11 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		_tmp9_ = page_notify_app_key_released (_tmp7_, _tmp8_);
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp9_;
-#line 1881 "AppWindow.c"
+#line 1886 "AppWindow.c"
 	} else {
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 1885 "AppWindow.c"
+#line 1890 "AppWindow.c"
 	}
 #line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
@@ -1917,11 +1922,11 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		result = TRUE;
 #line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1893 "AppWindow.c"
+#line 1898 "AppWindow.c"
 	}
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event != NULL) {
-#line 1897 "AppWindow.c"
+#line 1902 "AppWindow.c"
 		GdkEventKey* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1930,17 +1935,17 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 		_tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 1906 "AppWindow.c"
+#line 1911 "AppWindow.c"
 	} else {
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = FALSE;
-#line 1910 "AppWindow.c"
+#line 1915 "AppWindow.c"
 	}
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_;
 #line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1916 "AppWindow.c"
+#line 1921 "AppWindow.c"
 }
 
 
@@ -1958,7 +1963,7 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 	_tmp1_ = self->priv->current_page;
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 1934 "AppWindow.c"
+#line 1939 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		GdkEventFocus* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -1970,11 +1975,11 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 		_tmp4_ = page_notify_app_focus_in (_tmp2_, _tmp3_);
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 1946 "AppWindow.c"
+#line 1951 "AppWindow.c"
 	} else {
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 1950 "AppWindow.c"
+#line 1955 "AppWindow.c"
 	}
 #line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
@@ -1982,11 +1987,11 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 		result = TRUE;
 #line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1958 "AppWindow.c"
+#line 1963 "AppWindow.c"
 	}
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event != NULL) {
-#line 1962 "AppWindow.c"
+#line 1967 "AppWindow.c"
 		GdkEventFocus* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1995,17 +2000,17 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 		_tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp6_);
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp7_;
-#line 1971 "AppWindow.c"
+#line 1976 "AppWindow.c"
 	} else {
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 1975 "AppWindow.c"
+#line 1980 "AppWindow.c"
 	}
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp5_;
 #line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1981 "AppWindow.c"
+#line 1986 "AppWindow.c"
 }
 
 
@@ -2023,7 +2028,7 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 	_tmp1_ = self->priv->current_page;
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 1999 "AppWindow.c"
+#line 2004 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		GdkEventFocus* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -2035,11 +2040,11 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 		_tmp4_ = page_notify_app_focus_out (_tmp2_, _tmp3_);
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 2011 "AppWindow.c"
+#line 2016 "AppWindow.c"
 	} else {
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 2015 "AppWindow.c"
+#line 2020 "AppWindow.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
@@ -2047,11 +2052,11 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 		result = TRUE;
 #line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 2023 "AppWindow.c"
+#line 2028 "AppWindow.c"
 	}
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event != NULL) {
-#line 2027 "AppWindow.c"
+#line 2032 "AppWindow.c"
 		GdkEventFocus* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2060,17 +2065,17 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 		_tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp6_);
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp7_;
-#line 2036 "AppWindow.c"
+#line 2041 "AppWindow.c"
 	} else {
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 2040 "AppWindow.c"
+#line 2045 "AppWindow.c"
 	}
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp5_;
 #line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2046 "AppWindow.c"
+#line 2051 "AppWindow.c"
 }
 
 
@@ -2087,7 +2092,7 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi
 	_tmp0_ = self->priv->current_page;
 #line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 2063 "AppWindow.c"
+#line 2068 "AppWindow.c"
 		Page* _tmp1_ = NULL;
 		GdkEventConfigure* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
@@ -2103,12 +2108,12 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi
 			result = TRUE;
 #line 354 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return result;
-#line 2079 "AppWindow.c"
+#line 2084 "AppWindow.c"
 		}
 	}
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->configure_event != NULL) {
-#line 2084 "AppWindow.c"
+#line 2089 "AppWindow.c"
 		GdkEventConfigure* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2117,17 +2122,17 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi
 		_tmp6_ = GTK_WIDGET_CLASS (page_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp6_;
-#line 2093 "AppWindow.c"
+#line 2098 "AppWindow.c"
 	} else {
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = FALSE;
-#line 2097 "AppWindow.c"
+#line 2102 "AppWindow.c"
 	}
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp4_;
 #line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2103 "AppWindow.c"
+#line 2108 "AppWindow.c"
 }
 
 
@@ -2152,7 +2157,7 @@ void page_window_set_busy_cursor (PageWindow* self) {
 	if (_tmp0_ > 0) {
 #line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 2128 "AppWindow.c"
+#line 2133 "AppWindow.c"
 	}
 #line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -2180,7 +2185,7 @@ void page_window_set_busy_cursor (PageWindow* self) {
 	_g_object_unref0 (cursor);
 #line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (display);
-#line 2156 "AppWindow.c"
+#line 2161 "AppWindow.c"
 }
 
 
@@ -2205,7 +2210,7 @@ void page_window_set_normal_cursor (PageWindow* self) {
 		self->priv->busy_counter = 0;
 #line 373 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 2181 "AppWindow.c"
+#line 2186 "AppWindow.c"
 	} else {
 		gint _tmp1_ = 0;
 		gint _tmp2_ = 0;
@@ -2219,7 +2224,7 @@ void page_window_set_normal_cursor (PageWindow* self) {
 		if (_tmp2_ > 0) {
 #line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 2195 "AppWindow.c"
+#line 2200 "AppWindow.c"
 		}
 	}
 #line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2248,7 +2253,7 @@ void page_window_set_normal_cursor (PageWindow* self) {
 	_g_object_unref0 (cursor);
 #line 370 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (display);
-#line 2224 "AppWindow.c"
+#line 2229 "AppWindow.c"
 }
 
 
@@ -2275,7 +2280,7 @@ static void page_window_class_init (PageWindowClass * klass) {
 	((GtkWidgetClass *) klass)->configure_event = page_window_real_configure_event;
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_window_finalize;
-#line 2251 "AppWindow.c"
+#line 2256 "AppWindow.c"
 }
 
 
@@ -2286,7 +2291,7 @@ static void page_window_instance_init (PageWindow * self) {
 	self->priv->current_page = NULL;
 #line 278 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->busy_counter = 0;
-#line 2262 "AppWindow.c"
+#line 2267 "AppWindow.c"
 }
 
 
@@ -2298,7 +2303,7 @@ static void page_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->current_page);
 #line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (page_window_parent_class)->finalize (obj);
-#line 2274 "AppWindow.c"
+#line 2279 "AppWindow.c"
 }
 
 
@@ -2314,80 +2319,87 @@ GType page_window_get_type (void) {
 }
 
 
+static void _app_window_on_about_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_on_about ((AppWindow*) self);
+#line 2298 "AppWindow.c"
+}
+
+
 static void _app_window_on_quit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_quit ((AppWindow*) self);
-#line 2293 "AppWindow.c"
+#line 2305 "AppWindow.c"
 }
 
 
 static void _app_window_on_fullscreen_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_fullscreen ((AppWindow*) self);
-#line 2300 "AppWindow.c"
+#line 2312 "AppWindow.c"
 }
 
 
 static void _app_window_on_help_contents_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_help_contents ((AppWindow*) self);
-#line 2307 "AppWindow.c"
+#line 2319 "AppWindow.c"
 }
 
 
 static void _app_window_on_help_faq_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_help_faq ((AppWindow*) self);
-#line 2314 "AppWindow.c"
+#line 2326 "AppWindow.c"
 }
 
 
 static void _app_window_on_help_report_problem_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_help_report_problem ((AppWindow*) self);
-#line 2321 "AppWindow.c"
+#line 2333 "AppWindow.c"
 }
 
 
 static void _app_window_on_undo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_undo ((AppWindow*) self);
-#line 2328 "AppWindow.c"
+#line 2340 "AppWindow.c"
 }
 
 
 static void _app_window_on_redo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_redo ((AppWindow*) self);
-#line 2335 "AppWindow.c"
+#line 2347 "AppWindow.c"
 }
 
 
 static void _app_window_on_jump_to_file_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_jump_to_file ((AppWindow*) self);
-#line 2342 "AppWindow.c"
+#line 2354 "AppWindow.c"
 }
 
 
 static void _app_window_on_select_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_select_all ((AppWindow*) self);
-#line 2349 "AppWindow.c"
+#line 2361 "AppWindow.c"
 }
 
 
 static void _app_window_on_select_none_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_select_none ((AppWindow*) self);
-#line 2356 "AppWindow.c"
+#line 2368 "AppWindow.c"
 }
 
 
 static void _app_window_on_command_manager_altered_command_manager_altered (CommandManager* _sender, gboolean can_undo, gboolean can_redo, gpointer self) {
 #line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_command_manager_altered ((AppWindow*) self);
-#line 2363 "AppWindow.c"
+#line 2375 "AppWindow.c"
 }
 
 
@@ -2424,7 +2436,7 @@ AppWindow* app_window_construct (GType object_type) {
 	gtk_window_set_default_icon_name ("shotwell");
 #line 416 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_LIBRARY_WINDOW)) {
-#line 2400 "AppWindow.c"
+#line 2412 "AppWindow.c"
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -2441,7 +2453,7 @@ AppWindow* app_window_construct (GType object_type) {
 		self->dimensions = _tmp5_;
 #line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2417 "AppWindow.c"
+#line 2429 "AppWindow.c"
 	} else {
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
@@ -2461,7 +2473,7 @@ AppWindow* app_window_construct (GType object_type) {
 		self->dimensions = _tmp9_;
 #line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2437 "AppWindow.c"
+#line 2449 "AppWindow.c"
 	}
 #line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = self->dimensions;
@@ -2479,7 +2491,7 @@ AppWindow* app_window_construct (GType object_type) {
 	if (_tmp14_) {
 #line 426 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_maximize (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 2455 "AppWindow.c"
+#line 2467 "AppWindow.c"
 	}
 #line 428 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = app_window_command_manager;
@@ -2501,21 +2513,21 @@ AppWindow* app_window_construct (GType object_type) {
 	_tmp18_ = gtk_css_provider_new ();
 #line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	provider = _tmp18_;
-#line 2477 "AppWindow.c"
+#line 2489 "AppWindow.c"
 	{
 		GdkScreen* _tmp19_ = NULL;
 #line 442 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_css_provider_load_from_data (provider, RESOURCES_CUSTOM_CSS, (gssize) -1, &_inner_error_);
 #line 442 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2484 "AppWindow.c"
+#line 2496 "AppWindow.c"
 			goto __catch223_g_error;
 		}
 #line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = gdk_screen_get_default ();
 #line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_style_context_add_provider_for_screen (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (provider, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-#line 2491 "AppWindow.c"
+#line 2503 "AppWindow.c"
 	}
 	goto __finally223;
 	__catch223_g_error:
@@ -2535,7 +2547,7 @@ AppWindow* app_window_construct (GType object_type) {
 		g_debug ("AppWindow.vala:445: Unable to load custom CSS: %s", _tmp21_);
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 2511 "AppWindow.c"
+#line 2523 "AppWindow.c"
 	}
 	__finally223:
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2548,44 +2560,44 @@ AppWindow* app_window_construct (GType object_type) {
 		g_clear_error (&_inner_error_);
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return NULL;
-#line 2524 "AppWindow.c"
+#line 2536 "AppWindow.c"
 	}
 #line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (provider);
 #line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self;
-#line 2530 "AppWindow.c"
+#line 2542 "AppWindow.c"
 }
 
 
 static void app_window_real_on_fullscreen (AppWindow* self) {
-#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_critical ("Type `%s' does not implement abstract method `app_window_on_fullscreen'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return;
-#line 2539 "AppWindow.c"
+#line 2551 "AppWindow.c"
 }
 
 
 void app_window_on_fullscreen (AppWindow* self) {
-#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->on_fullscreen (self);
-#line 2548 "AppWindow.c"
+#line 2560 "AppWindow.c"
 }
 
 
 gboolean app_window_has_instance (void) {
 	gboolean result = FALSE;
 	AppWindow* _tmp0_ = NULL;
-#line 465 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 466 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 465 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 466 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp0_ != NULL;
-#line 465 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 466 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2561 "AppWindow.c"
+#line 2573 "AppWindow.c"
 }
 
 
@@ -2593,15 +2605,15 @@ AppWindow* app_window_get_instance (void) {
 	AppWindow* result = NULL;
 	AppWindow* _tmp0_ = NULL;
 	AppWindow* _tmp1_ = NULL;
-#line 469 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 469 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 469 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 469 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2577 "AppWindow.c"
+#line 2589 "AppWindow.c"
 }
 
 
@@ -2609,15 +2621,15 @@ FullscreenWindow* app_window_get_fullscreen (void) {
 	FullscreenWindow* result = NULL;
 	FullscreenWindow* _tmp0_ = NULL;
 	FullscreenWindow* _tmp1_ = NULL;
-#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2593 "AppWindow.c"
+#line 2605 "AppWindow.c"
 }
 
 
@@ -2627,13 +2639,13 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 	GtkBuilder* _tmp0_ = NULL;
 	void* _tmp12_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 476 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_val_if_fail (glade_filename != NULL, NULL);
 #line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_val_if_fail (glade_filename != NULL, NULL);
+#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_builder_new ();
-#line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	builder = _tmp0_;
-#line 2609 "AppWindow.c"
+#line 2621 "AppWindow.c"
 	{
 		GFile* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
@@ -2644,37 +2656,37 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 		GFile* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = app_dirs_get_resources_dir ();
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = _tmp1_;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = g_file_get_child (_tmp2_, "ui");
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = glade_filename;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = g_file_get_child (_tmp4_, _tmp5_);
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = g_file_get_path (_tmp7_);
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_builder_add_from_file (builder, _tmp9_, &_inner_error_);
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp9_);
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp4_);
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2650 "AppWindow.c"
+#line 2662 "AppWindow.c"
 			goto __catch224_g_error;
 		}
 	}
@@ -2684,59 +2696,59 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 		GError* _error_ = NULL;
 		GError* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
-#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_error_ = _inner_error_;
-#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 483 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _error_;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 483 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = _tmp10_->message;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_warning ("AppWindow.vala:482: Unable to create Gtk.Builder: %s\n", _tmp11_);
-#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 483 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		g_warning ("AppWindow.vala:483: Unable to create Gtk.Builder: %s\n", _tmp11_);
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (_error_);
-#line 2672 "AppWindow.c"
+#line 2684 "AppWindow.c"
 	}
 	__finally224:
-#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (builder);
-#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/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 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return NULL;
-#line 2685 "AppWindow.c"
+#line 2697 "AppWindow.c"
 	}
-#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = user;
-#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_builder_connect_signals (builder, _tmp12_);
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = builder;
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2695 "AppWindow.c"
+#line 2707 "AppWindow.c"
 }
 
 
 void app_window_error_message (const gchar* message, GtkWindow* parent) {
 	const gchar* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (message != NULL);
-#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent));
 #line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent));
+#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = message;
-#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_error_message_with_title (RESOURCES_APP_TITLE, _tmp0_, _tmp1_, TRUE);
-#line 2712 "AppWindow.c"
+#line 2724 "AppWindow.c"
 }
 
 
@@ -2756,83 +2768,83 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
 	gboolean _tmp14_ = FALSE;
 	gchar* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (title != NULL);
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (message != NULL);
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent));
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2742 "AppWindow.c"
+#line 2754 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2753 "AppWindow.c"
+#line 2765 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2762 "AppWindow.c"
+#line 2774 "AppWindow.c"
 	}
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = should_escape;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = build_alert_body_text (_tmp5_, _tmp6_, _tmp7_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp9_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp10_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp9_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp11_;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = title;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = message;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = should_escape;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = build_alert_body_text (_tmp12_, _tmp13_, _tmp14_);
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = _tmp15_;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp16_);
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp16_);
-#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_object_set (dialog, "use-markup", TRUE, NULL);
 #line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
+	g_object_set (dialog, "use-markup", TRUE, NULL);
 #line 506 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
+#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 2808 "AppWindow.c"
+#line 2820 "AppWindow.c"
 }
 
 
@@ -2855,93 +2867,93 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
 	const gchar* _tmp16_ = NULL;
 	gboolean response = FALSE;
 	gint _tmp17_ = 0;
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, FALSE);
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, FALSE);
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, FALSE);
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), FALSE);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2843 "AppWindow.c"
+#line 2855 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2854 "AppWindow.c"
+#line 2866 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2863 "AppWindow.c"
+#line 2875 "AppWindow.c"
 	}
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp8_);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp9_);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp8_);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp10_;
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = title;
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = message;
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = build_alert_body_text (_tmp11_, _tmp12_, TRUE);
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = _tmp13_;
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp14_);
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_free0 (_tmp14_);
 #line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_free0 (_tmp14_);
+#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = negative;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = affirmative;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_NO, _tmp16_, GTK_RESPONSE_YES, NULL);
 #line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_NO, _tmp16_, GTK_RESPONSE_YES, NULL);
+#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_urgency_hint (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), TRUE);
-#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp17_ == ((gint) GTK_RESPONSE_YES);
-#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 521 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = response;
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2917 "AppWindow.c"
+#line 2929 "AppWindow.c"
 }
 
 
@@ -2965,95 +2977,95 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
 	gchar* _tmp17_ = NULL;
 	gint response = 0;
 	gint _tmp18_ = 0;
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, 0);
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2953 "AppWindow.c"
+#line 2965 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2964 "AppWindow.c"
+#line 2976 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2973 "AppWindow.c"
+#line 2985 "AppWindow.c"
 	}
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp8_);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp9_);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp8_);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp10_;
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = negative;
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = affirmative;
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = _ ("_Cancel");
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp11_, GTK_RESPONSE_NO, _tmp12_, GTK_RESPONSE_YES, _tmp13_, GTK_RESPONSE_CANCEL, NULL);
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = title;
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = message;
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = build_alert_body_text (_tmp14_, _tmp15_, TRUE);
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = _tmp16_;
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp17_);
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_free0 (_tmp17_);
 #line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_free0 (_tmp17_);
+#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (dialog, "use-markup", TRUE, NULL);
-#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 538 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 538 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp18_;
-#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 540 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3029 "AppWindow.c"
+#line 3041 "AppWindow.c"
 }
 
 
@@ -3077,103 +3089,103 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 	GtkMessageDialog* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	GtkMessageDialog* _tmp19_ = NULL;
-#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 545 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 545 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 545 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3063 "AppWindow.c"
+#line 3075 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3074 "AppWindow.c"
+#line 3086 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3083 "AppWindow.c"
+#line 3095 "AppWindow.c"
 	}
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp5_);
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp6_);
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp6_;
-#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = dialog;
-#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = message;
-#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_message_dialog_set_markup (_tmp7_, _tmp8_);
 #line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_message_dialog_set_markup (_tmp7_, _tmp8_);
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = dialog;
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_object_set (_tmp9_, "use-markup", TRUE, NULL);
 #line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_object_set (_tmp9_, "use-markup", TRUE, NULL);
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = title;
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp11_ != NULL) {
-#line 3107 "AppWindow.c"
+#line 3119 "AppWindow.c"
 		const gchar* _tmp12_ = NULL;
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = title;
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 3113 "AppWindow.c"
+#line 3125 "AppWindow.c"
 	} else {
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = RESOURCES_APP_TITLE;
-#line 3117 "AppWindow.c"
+#line 3129 "AppWindow.c"
 	}
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = dialog;
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_window_get_type (), GtkWindow), _tmp10_);
 #line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_window_get_type (), GtkWindow), _tmp10_);
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = dialog;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = affirmative;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = _ ("_Cancel");
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_YES, _tmp16_, GTK_RESPONSE_CANCEL, NULL);
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = dialog;
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_dialog_get_type (), GtkDialog));
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp18_;
-#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp19_ = dialog;
-#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3149 "AppWindow.c"
+#line 3161 "AppWindow.c"
 }
 
 
@@ -3196,101 +3208,101 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 	GtkMessageDialog* _tmp16_ = NULL;
 	gint _tmp17_ = 0;
 	GtkMessageDialog* _tmp18_ = NULL;
-#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, 0);
-#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative_all != NULL, 0);
-#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3186 "AppWindow.c"
+#line 3198 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3197 "AppWindow.c"
+#line 3209 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3206 "AppWindow.c"
+#line 3218 "AppWindow.c"
 	}
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp5_);
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp6_);
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp6_;
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = title;
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 3220 "AppWindow.c"
+#line 3232 "AppWindow.c"
 		const gchar* _tmp9_ = NULL;
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = title;
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp9_;
-#line 3226 "AppWindow.c"
+#line 3238 "AppWindow.c"
 	} else {
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = RESOURCES_APP_TITLE;
-#line 3230 "AppWindow.c"
+#line 3242 "AppWindow.c"
 	}
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = dialog;
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), _tmp7_);
 #line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), _tmp7_);
+#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = dialog;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = negative;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = affirmative;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = affirmative_all;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = _ ("_Cancel");
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_dialog_get_type (), GtkDialog), _tmp12_, GTK_RESPONSE_NO, _tmp13_, GTK_RESPONSE_YES, _tmp14_, GTK_RESPONSE_APPLY, _tmp15_, GTK_RESPONSE_CANCEL, NULL);
-#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = dialog;
-#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_dialog_get_type (), GtkDialog));
-#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp17_;
-#line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = dialog;
-#line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3266 "AppWindow.c"
+#line 3278 "AppWindow.c"
 }
 
 
@@ -3300,24 +3312,24 @@ void app_window_database_error (GError* err) {
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = _ ("A fatal error occurred when accessing Shotwell’s library. Shotwell can" \
 "not continue.\n" \
 "\n" \
 "%s");
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = err;
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _tmp1_->message;
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_panic (_tmp4_);
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp4_);
-#line 3290 "AppWindow.c"
+#line 3302 "AppWindow.c"
 }
 
 
@@ -3326,43 +3338,43 @@ void app_window_panic (const gchar* msg) {
 	const gchar* _tmp1_ = NULL;
 	Application* _tmp2_ = NULL;
 	Application* _tmp3_ = NULL;
-#line 583 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (msg != NULL);
 #line 584 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (msg != NULL);
+#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = msg;
-#line 584 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_critical ("AppWindow.vala:584: %s", _tmp0_);
 #line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_critical ("AppWindow.vala:585: %s", _tmp0_);
+#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = msg;
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_error_message (_tmp1_, NULL);
-#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = application_get_instance ();
-#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	application_panic (_tmp3_);
-#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp3_);
-#line 3317 "AppWindow.c"
+#line 3329 "AppWindow.c"
 }
 
 
 static gchar* app_window_real_get_app_role (AppWindow* self) {
-#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_critical ("Type `%s' does not implement abstract method `app_window_get_app_role'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return NULL;
-#line 3326 "AppWindow.c"
+#line 3338 "AppWindow.c"
 }
 
 
 gchar* app_window_get_app_role (AppWindow* self) {
-#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return APP_WINDOW_GET_CLASS (self)->get_app_role (self);
-#line 3335 "AppWindow.c"
+#line 3347 "AppWindow.c"
 }
 
 
@@ -3373,44 +3385,44 @@ void app_window_on_about (AppWindow* self) {
 	GdkPixbuf* _tmp3_ = NULL;
 	GdkPixbuf* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 593 "/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);
-#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _ ("Visit the Shotwell web site");
-#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = resources_get_icon (RESOURCES_ICON_ABOUT_LOGO, -1);
-#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _ ("translator-credits");
-#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#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, "comments", _tmp1_, "copyright", RESOURCES_COPYRIGHT, "website", RESOURCES_HOME_URL, "license", RESOURCES_LICENSE, "website-label", _tmp2_, "authors", RESOURCES_AUTHORS, "logo", _tmp4_, "translator-credits", _tmp5_, NULL, NULL);
-#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 3366 "AppWindow.c"
+#line 3378 "AppWindow.c"
 }
 
 
 static void app_window_on_help_contents (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 607 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3374 "AppWindow.c"
+#line 3386 "AppWindow.c"
 	{
 		GdkScreen* _tmp0_ = NULL;
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		resources_launch_help (_tmp0_, NULL, &_inner_error_);
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3383 "AppWindow.c"
+#line 3395 "AppWindow.c"
 			goto __catch225_g_error;
 		}
 	}
@@ -3423,53 +3435,53 @@ static void app_window_on_help_contents (AppWindow* self) {
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = _ ("Unable to display help: %s");
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = err;
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp2_->message;
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = g_strdup_printf (_tmp1_, _tmp3_);
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp5_, NULL);
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp5_);
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3416 "AppWindow.c"
+#line 3428 "AppWindow.c"
 	}
 	__finally225:
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 609 "/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 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3427 "AppWindow.c"
+#line 3439 "AppWindow.c"
 	}
 }
 
 
 static void app_window_on_help_report_problem (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 615 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3436 "AppWindow.c"
+#line 3448 "AppWindow.c"
 	{
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_BUG_DB_URL, &_inner_error_);
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3442 "AppWindow.c"
+#line 3454 "AppWindow.c"
 			goto __catch226_g_error;
 		}
 	}
@@ -3482,53 +3494,53 @@ static void app_window_on_help_report_problem (AppWindow* self) {
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _ ("Unable to navigate to bug database: %s");
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = err;
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = _tmp1_->message;
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp4_, NULL);
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp4_);
-#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3475 "AppWindow.c"
+#line 3487 "AppWindow.c"
 	}
 	__finally226:
-#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/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 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3486 "AppWindow.c"
+#line 3498 "AppWindow.c"
 	}
 }
 
 
 static void app_window_on_help_faq (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3495 "AppWindow.c"
+#line 3507 "AppWindow.c"
 	{
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_FAQ_URL, &_inner_error_);
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3501 "AppWindow.c"
+#line 3513 "AppWindow.c"
 			goto __catch227_g_error;
 		}
 	}
@@ -3541,38 +3553,38 @@ static void app_window_on_help_faq (AppWindow* self) {
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _ ("Unable to display FAQ: %s");
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = err;
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = _tmp1_->message;
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp4_, NULL);
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp4_);
-#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3534 "AppWindow.c"
+#line 3546 "AppWindow.c"
 	}
 	__finally227:
-#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/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 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3545 "AppWindow.c"
+#line 3557 "AppWindow.c"
 	}
 }
 
@@ -3580,24 +3592,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 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = application_get_instance ();
-#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	application_exit (_tmp1_);
-#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp1_);
-#line 3561 "AppWindow.c"
+#line 3573 "AppWindow.c"
 }
 
 
 void app_window_on_quit (AppWindow* self) {
-#line 631 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 631 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->on_quit (self);
-#line 3570 "AppWindow.c"
+#line 3582 "AppWindow.c"
 }
 
 
@@ -3620,71 +3632,71 @@ void app_window_on_jump_to_file (AppWindow* self) {
 	MediaSource* _tmp14_ = NULL;
 	MediaSource* _tmp15_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _tmp4_ != 1;
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp5_) {
 #line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp5_) {
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3615 "AppWindow.c"
+#line 3627 "AppWindow.c"
 	}
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = page_get_view (_tmp7_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = view_collection_get_selected_at (_tmp9_, 0);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = data_view_get_source (_tmp11_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp12_) : NULL;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp13_ == NULL) {
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp12_);
-#line 3637 "AppWindow.c"
+#line 3649 "AppWindow.c"
 	}
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = _tmp13_;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_data_collection_unref0 (_tmp9_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	media = _tmp14_;
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = media;
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp15_ == NULL) {
 #line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp15_ == NULL) {
+#line 643 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (media);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 643 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3657 "AppWindow.c"
+#line 3669 "AppWindow.c"
 	}
 	{
 		AppWindow* _tmp16_ = NULL;
@@ -3692,25 +3704,25 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		MediaSource* _tmp18_ = NULL;
 		GFile* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = app_window_get_instance ();
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp18_ = media;
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = media_source_get_master_file (_tmp18_);
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp20_ = _tmp19_;
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_file_uri (_tmp17_, _tmp20_, &_inner_error_);
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp20_);
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp17_);
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3683 "AppWindow.c"
+#line 3695 "AppWindow.c"
 			goto __catch228_g_error;
 		}
 	}
@@ -3721,63 +3733,63 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		GError* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp21_ = err;
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp22_ = resources_jump_to_file_failed (_tmp21_);
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp23_ = _tmp22_;
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp23_, NULL);
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp23_);
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3710 "AppWindow.c"
+#line 3722 "AppWindow.c"
 	}
 	__finally228:
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#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"
 		g_critical ("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 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3723 "AppWindow.c"
+#line 3735 "AppWindow.c"
 	}
-#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (media);
-#line 3727 "AppWindow.c"
+#line 3739 "AppWindow.c"
 }
 
 
 static void app_window_real_destroy (GtkWidget* base) {
 	AppWindow * self;
-#line 651 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
 #line 652 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
+#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_quit (self);
-#line 3737 "AppWindow.c"
+#line 3749 "AppWindow.c"
 }
 
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 3750 "AppWindow.c"
+#line 3762 "AppWindow.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3790,100 +3802,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3781 "AppWindow.c"
+#line 3793 "AppWindow.c"
 				goto __catch229_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3790 "AppWindow.c"
+#line 3802 "AppWindow.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3806 "AppWindow.c"
+#line 3818 "AppWindow.c"
 				goto __catch229_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3817 "AppWindow.c"
+#line 3829 "AppWindow.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
-#line 3831 "AppWindow.c"
+#line 3843 "AppWindow.c"
 	}
 	goto __finally229;
 	__catch229_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 3845 "AppWindow.c"
+#line 3857 "AppWindow.c"
 	}
 	__finally229:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
-#line 3856 "AppWindow.c"
+#line 3868 "AppWindow.c"
 	}
 }
 
@@ -3894,53 +3906,53 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 	gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 655 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 655 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 660 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = get_nautilus_install_location ();
-#line 660 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 660 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _tmp1_ != NULL;
-#line 660 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 660 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_) {
-#line 3881 "AppWindow.c"
+#line 3893 "AppWindow.c"
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = file;
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = g_file_get_uri (_tmp3_);
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = string_replace (_tmp5_, "'", "\\\'");
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (tmp);
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		tmp = _tmp6_;
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp5_);
 #line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_free0 (_tmp5_);
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = tmp;
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		show_file_in_nautilus (_tmp7_, &_inner_error_);
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_propagate_error (error, _inner_error_);
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_g_free0 (tmp);
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3913 "AppWindow.c"
+#line 3925 "AppWindow.c"
 		}
 	} else {
 		GFile* _tmp8_ = NULL;
@@ -3950,44 +3962,44 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = file;
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = g_file_get_parent (_tmp8_);
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = g_file_get_uri (_tmp10_);
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = _tmp11_;
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = string_replace (_tmp12_, "'", "\\\'");
-#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"
 		tmp = _tmp13_;
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp12_);
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_object_unref0 (_tmp10_);
 #line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_object_unref0 (_tmp10_);
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp14_ = tmp;
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, _tmp14_, &_inner_error_);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_propagate_error (error, _inner_error_);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_g_free0 (tmp);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3955 "AppWindow.c"
+#line 3967 "AppWindow.c"
 		}
 	}
-#line 655 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (tmp);
-#line 3960 "AppWindow.c"
+#line 3972 "AppWindow.c"
 }
 
 
@@ -3996,42 +4008,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 669 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 669 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (url != NULL);
 #line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (url != NULL);
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_window_get_screen (_tmp0_);
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = url;
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	sys_show_uri (_tmp1_, _tmp2_, &_inner_error_);
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_propagate_error (error, _inner_error_);
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3987 "AppWindow.c"
+#line 3999 "AppWindow.c"
 	}
 }
 
 
 static void app_window_real_add_actions (AppWindow* self) {
-#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 675 "/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 3995 "AppWindow.c"
+#line 4007 "AppWindow.c"
 }
 
 
 void app_window_add_actions (AppWindow* self) {
-#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->add_actions (self);
-#line 4004 "AppWindow.c"
+#line 4016 "AppWindow.c"
 }
 
 
@@ -4048,81 +4060,81 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 	FullscreenWindow* _tmp12_ = NULL;
 	FullscreenWindow* _tmp13_ = NULL;
 	FullscreenWindow* _tmp14_ = NULL;
-#line 677 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 678 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 677 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 678 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 4029 "AppWindow.c"
+#line 4041 "AppWindow.c"
 		FullscreenWindow* _tmp1_ = NULL;
-#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = app_window_fullscreen_window;
-#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
-#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4037 "AppWindow.c"
+#line 4049 "AppWindow.c"
 	}
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 686 "/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 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_x = _tmp2_;
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->pos_y = _tmp3_;
 #line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	self->pos_y = _tmp3_;
+#line 687 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = page;
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = fullscreen_window_new (_tmp4_);
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp5_);
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fsw = _tmp5_;
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_ != NULL;
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_) {
-#line 4065 "AppWindow.c"
+#line 4077 "AppWindow.c"
 		Page* _tmp9_ = NULL;
 		Page* _tmp10_ = NULL;
 		FullscreenWindow* _tmp11_ = NULL;
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = fsw;
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_switching_to_fullscreen (_tmp10_, _tmp11_);
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 4079 "AppWindow.c"
+#line 4091 "AppWindow.c"
 	}
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = fsw;
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_fullscreen_window);
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_fullscreen_window = _tmp13_;
 #line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_fullscreen_window = _tmp13_;
+#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = app_window_fullscreen_window;
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 677 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 678 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (fsw);
-#line 4095 "AppWindow.c"
+#line 4107 "AppWindow.c"
 }
 
 
@@ -4135,65 +4147,65 @@ void app_window_end_fullscreen (AppWindow* self) {
 	gboolean _tmp5_ = FALSE;
 	FullscreenWindow* _tmp9_ = NULL;
 	FullscreenWindow* _tmp10_ = NULL;
-#line 697 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 698 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 698 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp0_ == NULL) {
 #line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp0_ == NULL) {
+#line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4116 "AppWindow.c"
+#line 4128 "AppWindow.c"
 	}
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->pos_x;
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->pos_y;
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp1_, _tmp2_);
-#line 703 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _tmp4_ != NULL;
-#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 4136 "AppWindow.c"
+#line 4148 "AppWindow.c"
 		Page* _tmp6_ = NULL;
 		Page* _tmp7_ = NULL;
 		FullscreenWindow* _tmp8_ = NULL;
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = app_window_fullscreen_window;
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_returning_from_fullscreen (_tmp7_, _tmp8_);
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4150 "AppWindow.c"
+#line 4162 "AppWindow.c"
 	}
-#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = app_window_fullscreen_window;
-#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
 #line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
+#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = app_window_fullscreen_window;
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
 #line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
+#line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_fullscreen_window);
-#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_fullscreen_window = NULL;
-#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 4166 "AppWindow.c"
+#line 4178 "AppWindow.c"
 }
 
 
@@ -4202,21 +4214,21 @@ GAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	GAction* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
-#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 717 "/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 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp2_;
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 4189 "AppWindow.c"
+#line 4201 "AppWindow.c"
 }
 
 
@@ -4226,42 +4238,42 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name,
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (name != NULL);
 #line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (name != NULL);
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4213 "AppWindow.c"
+#line 4225 "AppWindow.c"
 	}
-#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4221 "AppWindow.c"
+#line 4233 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = sensitive;
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 4230 "AppWindow.c"
+#line 4242 "AppWindow.c"
 	}
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4234 "AppWindow.c"
+#line 4246 "AppWindow.c"
 }
 
 
@@ -4271,45 +4283,45 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (name != NULL);
 #line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (name != NULL);
+#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4258 "AppWindow.c"
+#line 4270 "AppWindow.c"
 	}
-#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4266 "AppWindow.c"
+#line 4278 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4278 "AppWindow.c"
+#line 4290 "AppWindow.c"
 	}
-#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4282 "AppWindow.c"
+#line 4294 "AppWindow.c"
 }
 
 
@@ -4319,66 +4331,66 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (name != NULL);
 #line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (name != NULL);
+#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4306 "AppWindow.c"
+#line 4318 "AppWindow.c"
 	}
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4314 "AppWindow.c"
+#line 4326 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4326 "AppWindow.c"
+#line 4338 "AppWindow.c"
 	}
-#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4330 "AppWindow.c"
+#line 4342 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4337 "AppWindow.c"
+#line 4349 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4344 "AppWindow.c"
+#line 4356 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, 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 4351 "AppWindow.c"
+#line 4363 "AppWindow.c"
 }
 
 
@@ -4390,23 +4402,23 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 	Page* _tmp15_ = NULL;
 	Page* _tmp34_ = NULL;
 	Page* _tmp35_ = NULL;
-#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
 #line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
+#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = old_page;
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = new_page;
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_update_common_action_availability (self, _tmp0_, _tmp1_);
-#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = old_page;
-#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 4379 "AppWindow.c"
+#line 4391 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -4419,49 +4431,49 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		guint _tmp14_ = 0U;
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = old_page;
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/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 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp5_);
 #line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp5_);
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = old_page;
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE);
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/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 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp9_);
 #line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp9_);
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = old_page;
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = page_get_view (_tmp11_);
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp14_, 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 (_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 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 4428 "AppWindow.c"
+#line 4440 "AppWindow.c"
 	}
-#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = new_page;
-#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp15_ != NULL) {
-#line 4434 "AppWindow.c"
+#line 4446 "AppWindow.c"
 		Page* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
 		ViewCollection* _tmp18_ = NULL;
@@ -4480,135 +4492,135 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		ViewCollection* _tmp31_ = NULL;
 		ViewCollection* _tmp32_ = NULL;
 		gint _tmp33_ = 0;
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = new_page;
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = page_get_view (_tmp16_);
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp18_ = _tmp17_;
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 748 "/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 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp18_);
 #line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp18_);
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = new_page;
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp20_ = page_get_view (_tmp19_);
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp21_ = _tmp20_;
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/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 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp21_);
 #line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp21_);
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp22_ = new_page;
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp23_ = page_get_view (_tmp22_);
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp24_ = _tmp23_;
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/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 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp24_);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp25_ = new_page;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp26_ = new_page;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp27_ = page_get_view (_tmp26_);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp28_ = _tmp27_;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp29_ = view_collection_get_selected_count (_tmp28_);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp30_ = new_page;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp31_ = page_get_view (_tmp30_);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp32_ = _tmp31_;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp33_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_COLLECTION, DataCollection));
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_update_common_actions (self, _tmp25_, _tmp29_, _tmp33_);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp32_);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp28_);
-#line 4507 "AppWindow.c"
+#line 4519 "AppWindow.c"
 	}
-#line 755 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp34_ = old_page;
-#line 755 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp35_ = new_page;
-#line 755 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/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 4515 "AppWindow.c"
+#line 4527 "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 761 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 761 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
 #line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
+#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = new_page;
-#line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE);
-#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_set_common_action_sensitive (self, "CommonSelectAll", is_checkerboard);
 #line 765 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_set_common_action_sensitive (self, "CommonSelectAll", is_checkerboard);
+#line 766 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonSelectNone", is_checkerboard);
-#line 4534 "AppWindow.c"
+#line 4546 "AppWindow.c"
 }
 
 
 void app_window_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) {
-#line 761 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 761 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_action_availability (self, old_page, new_page);
-#line 4543 "AppWindow.c"
+#line 4555 "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 771 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_PAGE (page));
 #line 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_PAGE (page));
+#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page;
-#line 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE)) {
-#line 4556 "AppWindow.c"
+#line 4568 "AppWindow.c"
 		gint _tmp1_ = 0;
-#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = count;
-#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_set_common_action_sensitive (self, "CommonSelectAll", _tmp1_ > 0);
-#line 4562 "AppWindow.c"
+#line 4574 "AppWindow.c"
 	}
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = selected_count;
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonJumpToFile", _tmp2_ == 1);
-#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_decorate_undo_action (self);
 #line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_decorate_undo_action (self);
+#line 778 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 4572 "AppWindow.c"
+#line 4584 "AppWindow.c"
 }
 
 
 void app_window_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) {
-#line 771 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 771 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_actions (self, page, selected_count, count);
-#line 4581 "AppWindow.c"
+#line 4593 "AppWindow.c"
 }
 
 
@@ -4616,17 +4628,17 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 	Page* page = NULL;
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 781 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 781 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page = _tmp0_;
 #line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	page = _tmp0_;
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = page;
-#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 4599 "AppWindow.c"
+#line 4611 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -4636,42 +4648,481 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 		ViewCollection* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = page;
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = page;
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection));
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_update_common_actions (self, _tmp2_, _tmp6_, _tmp10_);
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4633 "AppWindow.c"
+#line 4645 "AppWindow.c"
 	}
-#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 781 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 4637 "AppWindow.c"
+#line 4649 "AppWindow.c"
 }
 
 
-static gpointer _command_manager_ref0 (gpointer self) {
+void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const gchar* new_label) {
+	GMenu* bar = NULL;
+	Page* _tmp0_ = NULL;
+	Page* _tmp1_ = NULL;
+	GMenuModel* _tmp2_ = NULL;
+	GMenu* _tmp3_ = NULL;
+	GMenu* _tmp4_ = NULL;
+	GMenu* _tmp5_ = NULL;
+	gint items = 0;
+	GMenu* _tmp6_ = NULL;
+	gint _tmp7_ = 0;
+#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (id != NULL);
+#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (new_label != NULL);
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp1_ = _tmp0_;
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp2_ = page_get_menubar (_tmp1_);
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_menu_get_type ()) ? ((GMenu*) _tmp2_) : NULL;
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp3_ == NULL) {
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_object_unref0 (_tmp2_);
+#line 4682 "AppWindow.c"
+	}
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp4_ = _tmp3_;
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (_tmp1_);
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	bar = _tmp4_;
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp5_ = bar;
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp5_ == NULL) {
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_object_unref0 (bar);
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		return;
+#line 4698 "AppWindow.c"
+	}
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp6_ = bar;
+#line 795 "/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 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	items = _tmp7_;
+#line 4706 "AppWindow.c"
+	{
+		gint i = 0;
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		i = 0;
+#line 4711 "AppWindow.c"
+		{
+			gboolean _tmp8_ = FALSE;
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+			_tmp8_ = TRUE;
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+			while (TRUE) {
+#line 4718 "AppWindow.c"
+				gint _tmp10_ = 0;
+				gint _tmp11_ = 0;
+				GMenuModel* model = NULL;
+				GMenu* _tmp12_ = NULL;
+				gint _tmp13_ = 0;
+				GMenuModel* _tmp14_ = NULL;
+				GMenu* _tmp15_ = NULL;
+				gint model_items = 0;
+				GMenuModel* _tmp16_ = NULL;
+				gint _tmp17_ = 0;
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				if (!_tmp8_) {
+#line 4731 "AppWindow.c"
+					gint _tmp9_ = 0;
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+					_tmp9_ = i;
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+					i = _tmp9_ + 1;
+#line 4737 "AppWindow.c"
+				}
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				_tmp8_ = FALSE;
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				_tmp10_ = i;
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				_tmp11_ = items;
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				if (!(_tmp10_ < _tmp11_)) {
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+					break;
+#line 4749 "AppWindow.c"
+				}
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				_tmp12_ = bar;
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				_tmp13_ = i;
+#line 797 "/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 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				model = _tmp14_;
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				_tmp15_ = bar;
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				if (_tmp15_ == NULL) {
+#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
+					_g_object_unref0 (model);
+#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
+					continue;
+#line 4767 "AppWindow.c"
+				}
+#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				_tmp16_ = model;
+#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				_tmp17_ = g_menu_model_get_n_items (_tmp16_);
+#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				model_items = _tmp17_;
+#line 4775 "AppWindow.c"
+				{
+					gint j = 0;
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+					j = 0;
+#line 4780 "AppWindow.c"
+					{
+						gboolean _tmp18_ = FALSE;
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+						_tmp18_ = TRUE;
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+						while (TRUE) {
+#line 4787 "AppWindow.c"
+							gint _tmp20_ = 0;
+							gint _tmp21_ = 0;
+							GMenuModel* subsection = NULL;
+							GMenuModel* _tmp22_ = NULL;
+							gint _tmp23_ = 0;
+							GMenuModel* _tmp24_ = NULL;
+							GMenuModel* _tmp25_ = NULL;
+							gint sub_items = 0;
+							GMenuModel* _tmp26_ = NULL;
+							gint _tmp27_ = 0;
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							if (!_tmp18_) {
+#line 4800 "AppWindow.c"
+								gint _tmp19_ = 0;
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+								_tmp19_ = j;
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+								j = _tmp19_ + 1;
+#line 4806 "AppWindow.c"
+							}
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							_tmp18_ = FALSE;
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							_tmp20_ = j;
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							_tmp21_ = model_items;
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							if (!(_tmp20_ < _tmp21_)) {
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+								break;
+#line 4818 "AppWindow.c"
+							}
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							_tmp22_ = model;
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							_tmp23_ = j;
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							_tmp24_ = g_menu_model_get_item_link (_tmp22_, _tmp23_, G_MENU_LINK_SECTION);
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							subsection = _tmp24_;
+#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							_tmp25_ = subsection;
+#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							if (_tmp25_ == NULL) {
+#line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
+								_g_object_unref0 (subsection);
+#line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
+								continue;
+#line 4836 "AppWindow.c"
+							}
+#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							_tmp26_ = subsection;
+#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							_tmp27_ = g_menu_model_get_n_items (_tmp26_);
+#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							sub_items = _tmp27_;
+#line 4844 "AppWindow.c"
+							{
+								gint k = 0;
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+								k = 0;
+#line 4849 "AppWindow.c"
+								{
+									gboolean _tmp28_ = FALSE;
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+									_tmp28_ = TRUE;
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+									while (TRUE) {
+#line 4856 "AppWindow.c"
+										gint _tmp30_ = 0;
+										gint _tmp31_ = 0;
+										GMenuAttributeIter* it = NULL;
+										GMenuModel* _tmp32_ = NULL;
+										gint _tmp33_ = 0;
+										GMenuAttributeIter* _tmp34_ = NULL;
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+										if (!_tmp28_) {
+#line 4865 "AppWindow.c"
+											gint _tmp29_ = 0;
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+											_tmp29_ = k;
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+											k = _tmp29_ + 1;
+#line 4871 "AppWindow.c"
+										}
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+										_tmp28_ = FALSE;
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+										_tmp30_ = k;
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+										_tmp31_ = sub_items;
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+										if (!(_tmp30_ < _tmp31_)) {
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+											break;
+#line 4883 "AppWindow.c"
+										}
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+										_tmp32_ = subsection;
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+										_tmp33_ = k;
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+										_tmp34_ = g_menu_model_iterate_item_attributes (_tmp32_, _tmp33_);
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+										it = _tmp34_;
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+										while (TRUE) {
+#line 4895 "AppWindow.c"
+											GMenuAttributeIter* _tmp35_ = NULL;
+											gboolean _tmp36_ = FALSE;
+											gboolean _tmp37_ = FALSE;
+											gboolean _tmp38_ = FALSE;
+											GMenuAttributeIter* _tmp39_ = NULL;
+											const gchar* _tmp40_ = NULL;
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+											_tmp35_ = it;
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+											_tmp36_ = g_menu_attribute_iter_next (_tmp35_);
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+											if (!_tmp36_) {
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												break;
+#line 4910 "AppWindow.c"
+											}
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+											_tmp39_ = it;
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+											_tmp40_ = g_menu_attribute_iter_get_name (_tmp39_);
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+											if (g_strcmp0 (_tmp40_, "id") == 0) {
+#line 4918 "AppWindow.c"
+												GMenuAttributeIter* _tmp41_ = NULL;
+												GVariant* _tmp42_ = NULL;
+												GVariant* _tmp43_ = NULL;
+												const gchar* _tmp44_ = NULL;
+												const gchar* _tmp45_ = NULL;
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp41_ = it;
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp42_ = g_menu_attribute_iter_get_value (_tmp41_);
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp43_ = _tmp42_;
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp44_ = g_variant_get_string (_tmp43_, NULL);
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp45_ = id;
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp38_ = g_strcmp0 (_tmp44_, _tmp45_) == 0;
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_g_variant_unref0 (_tmp43_);
+#line 4938 "AppWindow.c"
+											} else {
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp38_ = FALSE;
+#line 4942 "AppWindow.c"
+											}
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+											if (_tmp38_) {
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp37_ = TRUE;
+#line 4948 "AppWindow.c"
+											} else {
+												gboolean _tmp46_ = FALSE;
+												GMenuAttributeIter* _tmp47_ = NULL;
+												const gchar* _tmp48_ = NULL;
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp47_ = it;
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp48_ = g_menu_attribute_iter_get_name (_tmp47_);
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												if (g_strcmp0 (_tmp48_, "action") == 0) {
+#line 4959 "AppWindow.c"
+													GMenuAttributeIter* _tmp49_ = NULL;
+													GVariant* _tmp50_ = NULL;
+													GVariant* _tmp51_ = NULL;
+													const gchar* _tmp52_ = NULL;
+													const gchar* _tmp53_ = NULL;
+													gchar* _tmp54_ = NULL;
+													gchar* _tmp55_ = NULL;
+													gboolean _tmp56_ = FALSE;
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+													_tmp49_ = it;
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+													_tmp50_ = g_menu_attribute_iter_get_value (_tmp49_);
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+													_tmp51_ = _tmp50_;
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+													_tmp52_ = g_variant_get_string (_tmp51_, NULL);
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+													_tmp53_ = id;
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+													_tmp54_ = g_strconcat (".", _tmp53_, NULL);
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+													_tmp55_ = _tmp54_;
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+													_tmp56_ = g_str_has_suffix (_tmp52_, _tmp55_);
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+													_tmp46_ = _tmp56_;
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+													_g_free0 (_tmp55_);
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+													_g_variant_unref0 (_tmp51_);
+#line 4990 "AppWindow.c"
+												} else {
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+													_tmp46_ = FALSE;
+#line 4994 "AppWindow.c"
+												}
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp37_ = _tmp46_;
+#line 4998 "AppWindow.c"
+											}
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+											if (_tmp37_) {
+#line 5002 "AppWindow.c"
+												GMenu* md = NULL;
+												GMenuModel* _tmp57_ = NULL;
+												GMenu* _tmp58_ = NULL;
+												GMenuItem* m = NULL;
+												GMenuModel* _tmp59_ = NULL;
+												gint _tmp60_ = 0;
+												GMenuItem* _tmp61_ = NULL;
+												GMenuItem* _tmp62_ = NULL;
+												const gchar* _tmp63_ = NULL;
+												GMenu* _tmp64_ = NULL;
+												gint _tmp65_ = 0;
+												GMenu* _tmp66_ = NULL;
+												gint _tmp67_ = 0;
+												GMenuItem* _tmp68_ = NULL;
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp57_ = subsection;
+#line 816 "/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 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												md = _tmp58_;
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp59_ = subsection;
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp60_ = k;
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp61_ = g_menu_item_new_from_model (_tmp59_, _tmp60_);
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												m = _tmp61_;
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp62_ = m;
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp63_ = new_label;
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												g_menu_item_set_label (_tmp62_, _tmp63_);
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp64_ = md;
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp65_ = k;
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												g_menu_remove (_tmp64_, _tmp65_);
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp66_ = md;
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp67_ = k;
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_tmp68_ = m;
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												g_menu_insert_item (_tmp66_, _tmp67_, _tmp68_);
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_g_object_unref0 (m);
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_g_object_unref0 (md);
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_g_object_unref0 (it);
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_g_object_unref0 (subsection);
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_g_object_unref0 (model);
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												_g_object_unref0 (bar);
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												return;
+#line 5065 "AppWindow.c"
+											}
+										}
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+										_g_object_unref0 (it);
+#line 5070 "AppWindow.c"
+									}
+								}
+							}
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							_g_object_unref0 (subsection);
+#line 5076 "AppWindow.c"
+						}
+					}
+				}
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				_g_object_unref0 (model);
+#line 5082 "AppWindow.c"
+			}
+		}
+	}
 #line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (bar);
+#line 5088 "AppWindow.c"
+}
+
+
+static gpointer _command_manager_ref0 (gpointer self) {
+#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self ? command_manager_ref (self) : NULL;
-#line 4644 "AppWindow.c"
+#line 5095 "AppWindow.c"
 }
 
 
@@ -4679,41 +5130,150 @@ CommandManager* app_window_get_command_manager (void) {
 	CommandManager* result = NULL;
 	CommandManager* _tmp0_ = NULL;
 	CommandManager* _tmp1_ = NULL;
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _command_manager_ref0 (_tmp0_);
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 4660 "AppWindow.c"
+#line 5111 "AppWindow.c"
 }
 
 
 static void app_window_on_command_manager_altered (AppWindow* self) {
-#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 836 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_undo_action (self);
-#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 4671 "AppWindow.c"
+#line 5122 "AppWindow.c"
 }
 
 
 static void app_window_decorate_command_manager_action (AppWindow* self, const gchar* name, const gchar* prefix, const gchar* default_explanation, CommandDescription* desc) {
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	GSimpleAction* action = NULL;
+	const gchar* _tmp0_ = NULL;
+	GAction* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+	gchar* label = NULL;
+	const gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	CommandDescription* _tmp6_ = NULL;
+	const gchar* _tmp18_ = NULL;
+	const gchar* _tmp19_ = NULL;
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (name != NULL);
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (prefix != NULL);
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (default_explanation != NULL);
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((desc == NULL) || IS_COMMAND_DESCRIPTION (desc));
-#line 4686 "AppWindow.c"
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp0_ = name;
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp1_ = app_window_get_common_action (self, _tmp0_);
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp2_ == NULL) {
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_object_unref0 (_tmp1_);
+#line 5158 "AppWindow.c"
+	}
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp3_ = action;
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp3_ == NULL) {
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_object_unref0 (action);
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		return;
+#line 5170 "AppWindow.c"
+	}
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp4_ = prefix;
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp5_ = g_strdup (_tmp4_);
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	label = _tmp5_;
+#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp6_ = desc;
+#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp6_ != NULL) {
+#line 5182 "AppWindow.c"
+		const gchar* _tmp7_ = NULL;
+		CommandDescription* _tmp8_ = NULL;
+		gchar* _tmp9_ = NULL;
+		gchar* _tmp10_ = NULL;
+		gchar* _tmp11_ = NULL;
+		gchar* _tmp12_ = NULL;
+		gchar* _tmp13_ = NULL;
+		GSimpleAction* _tmp14_ = NULL;
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp7_ = label;
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp8_ = desc;
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp9_ = command_description_get_name (_tmp8_);
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp10_ = _tmp9_;
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp11_ = g_strconcat (" ", _tmp10_, NULL);
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp12_ = _tmp11_;
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp13_ = g_strconcat (_tmp7_, _tmp12_, NULL);
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_free0 (label);
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		label = _tmp13_;
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_free0 (_tmp12_);
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_free0 (_tmp10_);
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp14_ = action;
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		g_simple_action_set_enabled (_tmp14_, TRUE);
+#line 5217 "AppWindow.c"
+	} else {
+		const gchar* _tmp15_ = NULL;
+		gchar* _tmp16_ = NULL;
+		GSimpleAction* _tmp17_ = NULL;
+#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp15_ = prefix;
+#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp16_ = g_strdup (_tmp15_);
+#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_free0 (label);
+#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		label = _tmp16_;
+#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp17_ = action;
+#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		g_simple_action_set_enabled (_tmp17_, FALSE);
+#line 5234 "AppWindow.c"
+	}
+#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp18_ = name;
+#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp19_ = label;
+#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_update_menu_item_label (self, _tmp18_, _tmp19_);
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_free0 (label);
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (action);
+#line 5246 "AppWindow.c"
 }
 
 
@@ -4722,23 +5282,23 @@ void app_window_decorate_undo_action (AppWindow* self) {
 	CommandManager* _tmp1_ = NULL;
 	CommandDescription* _tmp2_ = NULL;
 	CommandDescription* _tmp3_ = NULL;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 860 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = command_manager_get_undo_description (_tmp1_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_command_manager_action (self, "CommonUndo", RESOURCES_UNDO_MENU, "", _tmp3_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 4711 "AppWindow.c"
+#line 5271 "AppWindow.c"
 }
 
 
@@ -4747,47 +5307,47 @@ void app_window_decorate_redo_action (AppWindow* self) {
 	CommandManager* _tmp1_ = NULL;
 	CommandDescription* _tmp2_ = NULL;
 	CommandDescription* _tmp3_ = NULL;
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = command_manager_get_redo_description (_tmp1_);
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_command_manager_action (self, "CommonRedo", RESOURCES_REDO_MENU, "", _tmp3_);
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 4736 "AppWindow.c"
+#line 5296 "AppWindow.c"
 }
 
 
 static void app_window_on_undo (AppWindow* self) {
 	CommandManager* _tmp0_ = NULL;
-#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_undo (_tmp0_);
-#line 4748 "AppWindow.c"
+#line 5308 "AppWindow.c"
 }
 
 
 static void app_window_on_redo (AppWindow* self) {
 	CommandManager* _tmp0_ = NULL;
-#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 829 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 829 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_redo (_tmp0_);
-#line 4760 "AppWindow.c"
+#line 5320 "AppWindow.c"
 }
 
 
@@ -4796,43 +5356,43 @@ static void app_window_on_select_all (AppWindow* self) {
 	Page* _tmp0_ = NULL;
 	CheckerboardPage* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-#line 832 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 878 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 4779 "AppWindow.c"
+#line 5339 "AppWindow.c"
 	}
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page;
-#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 4787 "AppWindow.c"
+#line 5347 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		view_collection_select_all (_tmp5_);
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4801 "AppWindow.c"
+#line 5361 "AppWindow.c"
 	}
-#line 832 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 878 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 4805 "AppWindow.c"
+#line 5365 "AppWindow.c"
 }
 
 
@@ -4841,43 +5401,43 @@ static void app_window_on_select_none (AppWindow* self) {
 	Page* _tmp0_ = NULL;
 	CheckerboardPage* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 4824 "AppWindow.c"
+#line 5384 "AppWindow.c"
 	}
-#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page;
-#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 4832 "AppWindow.c"
+#line 5392 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		view_collection_unselect_all (_tmp5_);
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4846 "AppWindow.c"
+#line 5406 "AppWindow.c"
 	}
-#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 4850 "AppWindow.c"
+#line 5410 "AppWindow.c"
 }
 
 
@@ -4889,40 +5449,40 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
 	gboolean _tmp2_ = FALSE;
 	GdkEventConfigure* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_window_get_state (_tmp0_);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->maximized = _tmp1_ == GDK_WINDOW_STATE_MAXIMIZED;
-#line 847 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->maximized;
-#line 847 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp2_) {
-#line 4876 "AppWindow.c"
+#line 5436 "AppWindow.c"
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 894 "/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 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.width = _tmp3_;
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.height = _tmp4_;
-#line 4885 "AppWindow.c"
+#line 5445 "AppWindow.c"
 	}
-#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = event;
-#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 896 "/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 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp6_;
-#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 4895 "AppWindow.c"
+#line 5455 "AppWindow.c"
 }
 
 
@@ -4949,7 +5509,7 @@ static void app_window_class_init (AppWindowClass * klass) {
 	((GtkWidgetClass *) klass)->configure_event = app_window_real_configure_event;
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = app_window_finalize;
-#line 4922 "AppWindow.c"
+#line 5482 "AppWindow.c"
 }
 
 
@@ -4960,7 +5520,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 4933 "AppWindow.c"
+#line 5493 "AppWindow.c"
 }
 
 
@@ -4970,7 +5530,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 4943 "AppWindow.c"
+#line 5503 "AppWindow.c"
 }
 
 
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index 41751e8..99f054d 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -447,6 +447,7 @@ public abstract class AppWindow : PageWindow {
     }
 
     private const GLib.ActionEntry[] common_actions = {
+        { "CommonAbout", on_about },
         { "CommonQuit", on_quit },
         { "CommonFullscreen", on_fullscreen },
         { "CommonHelpContents", on_help_contents },
@@ -782,6 +783,51 @@ public abstract class AppWindow : PageWindow {
         if (page != null)
             update_common_actions(page, page.get_view().get_selected_count(), page.get_view().get_count());
     }
+
+    public void update_menu_item_label (string id,
+                                         string new_label) {
+        var bar = this.get_current_page().get_menubar() as GLib.Menu;
+
+        if (bar == null) {
+            return;
+        }
+
+        var items = bar.get_n_items ();
+        for (var i = 0; i< items; i++) {
+            var model = bar.get_item_link (i, GLib.Menu.LINK_SUBMENU);
+            if (bar == null) {
+                continue;
+            }
+
+            var model_items = model.get_n_items ();
+            for (var j = 0; j < model_items; j++) {
+                var subsection = model.get_item_link (j, GLib.Menu.LINK_SECTION);
+
+                if (subsection == null)
+                    continue;
+
+                // Recurse into submenus
+                var sub_items = subsection.get_n_items ();
+                for (var k = 0; k < sub_items; k++) {
+                    var it = subsection.iterate_item_attributes (k);
+                    while (it.next ()) {
+                        if ((it.get_name() == "id" && it.get_value ().get_string () == id) ||
+                            (it.get_name() == "action" && it.get_value().get_string().has_suffix("." + id))) {
+                            var md = subsection as GLib.Menu;
+                            var m = new GLib.MenuItem.from_model (subsection, k);
+                            m.set_label (new_label);
+                            md.remove (k);
+                            md.insert_item (k, m);
+
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
     
     public static CommandManager get_command_manager() {
         return command_manager;
@@ -794,21 +840,21 @@ public abstract class AppWindow : PageWindow {
     
     private void decorate_command_manager_action(string name, string prefix,
         string default_explanation, CommandDescription? desc) {
-#if 0
-        Gtk.Action? action = get_common_action(name);
-        if (action == null)
+        var action = get_common_action(name) as GLib.SimpleAction;
+        if (action == null) {
             return;
-        
+        }
+
+        string label = prefix;
+
         if (desc != null) {
-            action.label = "%s %s".printf(prefix, desc.get_name());
-            action.tooltip = desc.get_explanation();
-            action.sensitive = true;
+            label += " " + desc.get_name();
+            action.set_enabled(true);
         } else {
-            action.label = prefix;
-            action.tooltip = default_explanation;
-            action.sensitive = false;
+            label = prefix;
+            action.set_enabled(false);
         }
-#endif
+        this.update_menu_item_label(name, label);
     }
     
     public void decorate_undo_action() {
diff --git a/src/Application.c b/src/Application.c
index 7f33933..8d958cc 100644
--- a/src/Application.c
+++ b/src/Application.c
@@ -1,4 +1,4 @@
-/* Application.c generated by valac 0.34.2, the Vala compiler
+/* Application.c generated by valac 0.32.1, the Vala compiler
  * generated from Application.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -127,6 +127,7 @@ gboolean application_get_is_remote (void);
 gboolean application_get_is_direct (void);
 void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1);
 void application_set_menubar (GMenuModel* model);
+void application_set_appmenu (GMenuModel* model);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 GType library_window_get_type (void) G_GNUC_CONST;
@@ -156,7 +157,7 @@ void application_set_raw_thumbs_fix_required (Application* self, gboolean should
 	_tmp0_ = should_fixup;
 #line 25 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->fixup_raw_thumbs = _tmp0_;
-#line 160 "Application.c"
+#line 161 "Application.c"
 }
 
 
@@ -171,14 +172,14 @@ gboolean application_get_raw_thumbs_fix_required (Application* self) {
 	result = _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 175 "Application.c"
+#line 176 "Application.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 33 "/home/jens/Source/shotwell/src/Application.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 182 "Application.c"
+#line 183 "Application.c"
 }
 
 
@@ -196,7 +197,7 @@ GtkApplication* application_get_system_app (Application* self) {
 	result = _tmp1_;
 #line 33 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 200 "Application.c"
+#line 201 "Application.c"
 }
 
 
@@ -205,21 +206,21 @@ static gint _application_on_command_line_g_application_command_line (GApplicatio
 	result = application_on_command_line (command_line);
 #line 65 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 209 "Application.c"
+#line 210 "Application.c"
 }
 
 
 static void _application_on_activated_g_application_activate (GApplication* _sender, gpointer self) {
 #line 68 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 216 "Application.c"
+#line 217 "Application.c"
 }
 
 
 static void _application_on_activated_g_application_startup (GApplication* _sender, gpointer self) {
 #line 69 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 223 "Application.c"
+#line 224 "Application.c"
 }
 
 
@@ -237,7 +238,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 	_tmp0_ = is_direct;
 #line 40 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
-#line 241 "Application.c"
+#line 242 "Application.c"
 		GtkApplication* _tmp1_ = NULL;
 #line 45 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp1_ = gtk_application_new ("org.yorba.shotwell-direct", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_NON_UNIQUE);
@@ -245,7 +246,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		_g_object_unref0 (self->priv->system_app);
 #line 45 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->system_app = _tmp1_;
-#line 249 "Application.c"
+#line 250 "Application.c"
 	} else {
 		GtkApplication* _tmp2_ = NULL;
 #line 51 "/home/jens/Source/shotwell/src/Application.vala"
@@ -254,7 +255,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		_g_object_unref0 (self->priv->system_app);
 #line 51 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->system_app = _tmp2_;
-#line 258 "Application.c"
+#line 259 "Application.c"
 	}
 	{
 		GtkApplication* _tmp3_ = NULL;
@@ -264,12 +265,12 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		g_application_register (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_application_get_type (), GApplication), NULL, &_inner_error_);
 #line 57 "/home/jens/Source/shotwell/src/Application.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 268 "Application.c"
-			goto __catch557_g_error;
+#line 269 "Application.c"
+			goto __catch555_g_error;
 		}
 	}
-	goto __finally557;
-	__catch557_g_error:
+	goto __finally555;
+	__catch555_g_error:
 	{
 		GError* e = NULL;
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
@@ -280,9 +281,9 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		application_panic (self);
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_error_free0 (e);
-#line 284 "Application.c"
+#line 285 "Application.c"
 	}
-	__finally557:
+	__finally555:
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
@@ -291,7 +292,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		g_clear_error (&_inner_error_);
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		return NULL;
-#line 295 "Application.c"
+#line 296 "Application.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = is_direct;
@@ -301,13 +302,13 @@ static Application* application_construct (GType object_type, gboolean is_direct
 	_tmp5_ = self->priv->direct;
 #line 64 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp5_) {
-#line 305 "Application.c"
+#line 306 "Application.c"
 		GtkApplication* _tmp6_ = NULL;
 #line 65 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp6_ = self->priv->system_app;
 #line 65 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_application_get_type (), GApplication), "command-line", (GCallback) _application_on_command_line_g_application_command_line, NULL);
-#line 311 "Application.c"
+#line 312 "Application.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7_ = self->priv->system_app;
@@ -319,14 +320,14 @@ static Application* application_construct (GType object_type, gboolean is_direct
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, g_application_get_type (), GApplication), "startup", (GCallback) _application_on_activated_g_application_startup, NULL);
 #line 39 "/home/jens/Source/shotwell/src/Application.vala"
 	return self;
-#line 323 "Application.c"
+#line 324 "Application.c"
 }
 
 
 static Application* application_new (gboolean is_direct) {
 #line 39 "/home/jens/Source/shotwell/src/Application.vala"
 	return application_construct (TYPE_APPLICATION, is_direct);
-#line 330 "Application.c"
+#line 331 "Application.c"
 }
 
 
@@ -355,7 +356,7 @@ void application_send_to_primary_instance (gchar** argv, int argv_length1) {
 	g_application_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication), _tmp3__length1, _tmp3_);
 #line 78 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 359 "Application.c"
+#line 360 "Application.c"
 }
 
 
@@ -378,7 +379,7 @@ void application_present_primary_instance (void) {
 	g_application_activate (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication));
 #line 87 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 382 "Application.c"
+#line 383 "Application.c"
 }
 
 
@@ -405,7 +406,7 @@ gboolean application_get_is_remote (void) {
 	result = _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 409 "Application.c"
+#line 410 "Application.c"
 }
 
 
@@ -429,7 +430,7 @@ gboolean application_get_is_direct (void) {
 	result = _tmp3_;
 #line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 433 "Application.c"
+#line 434 "Application.c"
 }
 
 
@@ -458,7 +459,7 @@ void application_set_accels_for_action (const gchar* action, gchar** accel, int
 	gtk_application_set_accels_for_action (_tmp2_, _tmp3_, _tmp4_);
 #line 99 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 462 "Application.c"
+#line 463 "Application.c"
 }
 
 
@@ -481,7 +482,30 @@ void application_set_menubar (GMenuModel* model) {
 	gtk_application_set_menubar (_tmp2_, _tmp3_);
 #line 103 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 485 "Application.c"
+#line 486 "Application.c"
+}
+
+
+void application_set_appmenu (GMenuModel* model) {
+	Application* _tmp0_ = NULL;
+	Application* _tmp1_ = NULL;
+	GtkApplication* _tmp2_ = NULL;
+	GMenuModel* _tmp3_ = NULL;
+#line 106 "/home/jens/Source/shotwell/src/Application.vala"
+	g_return_if_fail ((model == NULL) || G_IS_MENU_MODEL (model));
+#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp0_ = application_get_instance ();
+#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp1_ = _tmp0_;
+#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp2_ = _tmp1_->priv->system_app;
+#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp3_ = model;
+#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+	gtk_application_set_app_menu (_tmp2_, _tmp3_);
+#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+	_application_unref0 (_tmp1_);
+#line 509 "Application.c"
 }
 
 
@@ -501,58 +525,58 @@ void application_on_activated (void) {
 	LibraryWindow* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	LibraryWindow* _tmp5_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Application.vala"
+#line 119 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
-#line 115 "/home/jens/Source/shotwell/src/Application.vala"
+#line 119 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = _tmp0_;
-#line 115 "/home/jens/Source/shotwell/src/Application.vala"
+#line 119 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 117 "/home/jens/Source/shotwell/src/Application.vala"
+#line 121 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 117 "/home/jens/Source/shotwell/src/Application.vala"
+#line 121 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_LIBRARY_WINDOW) ? ((LibraryWindow*) _tmp2_) : NULL;
-#line 117 "/home/jens/Source/shotwell/src/Application.vala"
+#line 121 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp3_ == NULL) {
-#line 117 "/home/jens/Source/shotwell/src/Application.vala"
+#line 121 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (_tmp2_);
-#line 519 "Application.c"
+#line 543 "Application.c"
 	}
-#line 117 "/home/jens/Source/shotwell/src/Application.vala"
+#line 121 "/home/jens/Source/shotwell/src/Application.vala"
 	lw = _tmp3_;
-#line 118 "/home/jens/Source/shotwell/src/Application.vala"
+#line 122 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp5_ = lw;
-#line 118 "/home/jens/Source/shotwell/src/Application.vala"
+#line 122 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp5_ != NULL) {
-#line 527 "Application.c"
+#line 551 "Application.c"
 		gboolean _tmp6_ = FALSE;
-#line 118 "/home/jens/Source/shotwell/src/Application.vala"
+#line 122 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp6_ = application_get_is_direct ();
-#line 118 "/home/jens/Source/shotwell/src/Application.vala"
+#line 122 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = !_tmp6_;
-#line 533 "Application.c"
+#line 557 "Application.c"
 	} else {
-#line 118 "/home/jens/Source/shotwell/src/Application.vala"
+#line 122 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = FALSE;
-#line 537 "Application.c"
+#line 561 "Application.c"
 	}
-#line 118 "/home/jens/Source/shotwell/src/Application.vala"
+#line 122 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp4_) {
-#line 541 "Application.c"
+#line 565 "Application.c"
 		LibraryWindow* _tmp7_ = NULL;
 		LibraryWindow* _tmp8_ = NULL;
-#line 119 "/home/jens/Source/shotwell/src/Application.vala"
+#line 123 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp7_ = library_window_get_app ();
-#line 119 "/home/jens/Source/shotwell/src/Application.vala"
+#line 123 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp8_ = _tmp7_;
-#line 119 "/home/jens/Source/shotwell/src/Application.vala"
+#line 123 "/home/jens/Source/shotwell/src/Application.vala"
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow));
-#line 119 "/home/jens/Source/shotwell/src/Application.vala"
+#line 123 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (_tmp8_);
-#line 552 "Application.c"
+#line 576 "Application.c"
 	}
-#line 114 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (lw);
-#line 556 "Application.c"
+#line 580 "Application.c"
 }
 
 
@@ -574,101 +598,101 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 	gint _argv_size_ = 0;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 131 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (G_IS_APPLICATION_COMMAND_LINE (acl), 0);
-#line 132 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = acl;
-#line 132 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = g_application_command_line_get_arguments (_tmp0_, &_tmp1_);
-#line 132 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 	argv = _tmp2_;
-#line 132 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 	argv_length1 = _tmp1_;
-#line 132 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 	_argv_size_ = argv_length1;
-#line 134 "/home/jens/Source/shotwell/src/Application.vala"
+#line 138 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = argv;
-#line 134 "/home/jens/Source/shotwell/src/Application.vala"
+#line 138 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3__length1 = argv_length1;
-#line 134 "/home/jens/Source/shotwell/src/Application.vala"
+#line 138 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp3_ != NULL) {
-#line 596 "Application.c"
+#line 620 "Application.c"
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = argv;
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4__length1 = argv_length1;
-#line 603 "Application.c"
+#line 627 "Application.c"
 		{
 			gchar** s_collection = NULL;
 			gint s_collection_length1 = 0;
 			gint _s_collection_size_ = 0;
 			gint s_it = 0;
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 			s_collection = _tmp4_;
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 			s_collection_length1 = _tmp4__length1;
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 			for (s_it = 0; s_it < _tmp4__length1; s_it = s_it + 1) {
-#line 615 "Application.c"
+#line 639 "Application.c"
 				gchar* _tmp5_ = NULL;
 				gchar* s = NULL;
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 				_tmp5_ = g_strdup (s_collection[s_it]);
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 				s = _tmp5_;
-#line 622 "Application.c"
+#line 646 "Application.c"
 				{
 					LibraryWindow* lw = NULL;
 					AppWindow* _tmp6_ = NULL;
 					LibraryWindow* _tmp7_ = NULL;
 					LibraryWindow* _tmp8_ = NULL;
-#line 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 140 "/home/jens/Source/shotwell/src/Application.vala"
 					_tmp6_ = app_window_get_instance ();
-#line 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 140 "/home/jens/Source/shotwell/src/Application.vala"
 					_tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_LIBRARY_WINDOW) ? ((LibraryWindow*) _tmp6_) : NULL;
-#line 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 140 "/home/jens/Source/shotwell/src/Application.vala"
 					if (_tmp7_ == NULL) {
-#line 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 140 "/home/jens/Source/shotwell/src/Application.vala"
 						_g_object_unref0 (_tmp6_);
-#line 636 "Application.c"
+#line 660 "Application.c"
 					}
-#line 136 "/home/jens/Source/shotwell/src/Application.vala"
+#line 140 "/home/jens/Source/shotwell/src/Application.vala"
 					lw = _tmp7_;
-#line 137 "/home/jens/Source/shotwell/src/Application.vala"
+#line 141 "/home/jens/Source/shotwell/src/Application.vala"
 					_tmp8_ = lw;
-#line 137 "/home/jens/Source/shotwell/src/Application.vala"
+#line 141 "/home/jens/Source/shotwell/src/Application.vala"
 					if (_tmp8_ != NULL) {
-#line 644 "Application.c"
+#line 668 "Application.c"
 						LibraryWindow* _tmp9_ = NULL;
 						const gchar* _tmp10_ = NULL;
-#line 138 "/home/jens/Source/shotwell/src/Application.vala"
+#line 142 "/home/jens/Source/shotwell/src/Application.vala"
 						_tmp9_ = lw;
-#line 138 "/home/jens/Source/shotwell/src/Application.vala"
+#line 142 "/home/jens/Source/shotwell/src/Application.vala"
 						_tmp10_ = s;
-#line 138 "/home/jens/Source/shotwell/src/Application.vala"
+#line 142 "/home/jens/Source/shotwell/src/Application.vala"
 						library_window_mounted_camera_shell_notification (_tmp9_, _tmp10_, FALSE);
-#line 653 "Application.c"
+#line 677 "Application.c"
 					}
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 					_g_object_unref0 (lw);
-#line 135 "/home/jens/Source/shotwell/src/Application.vala"
+#line 139 "/home/jens/Source/shotwell/src/Application.vala"
 					_g_free0 (s);
-#line 659 "Application.c"
+#line 683 "Application.c"
 				}
 			}
 		}
 	}
-#line 142 "/home/jens/Source/shotwell/src/Application.vala"
+#line 146 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 143 "/home/jens/Source/shotwell/src/Application.vala"
+#line 147 "/home/jens/Source/shotwell/src/Application.vala"
 	result = 0;
-#line 143 "/home/jens/Source/shotwell/src/Application.vala"
+#line 147 "/home/jens/Source/shotwell/src/Application.vala"
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 143 "/home/jens/Source/shotwell/src/Application.vala"
+#line 147 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 672 "Application.c"
+#line 696 "Application.c"
 }
 
 
@@ -685,22 +709,22 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
      */
 void application_init (gboolean is_direct) {
 	Application* _tmp0_ = NULL;
-#line 158 "/home/jens/Source/shotwell/src/Application.vala"
+#line 162 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_instance;
-#line 158 "/home/jens/Source/shotwell/src/Application.vala"
+#line 162 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_ == NULL) {
-#line 693 "Application.c"
+#line 717 "Application.c"
 		gboolean _tmp1_ = FALSE;
 		Application* _tmp2_ = NULL;
-#line 159 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp1_ = is_direct;
-#line 159 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp2_ = application_new (_tmp1_);
-#line 159 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 		_application_unref0 (application_instance);
-#line 159 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 		application_instance = _tmp2_;
-#line 704 "Application.c"
+#line 728 "Application.c"
 	}
 }
 
@@ -708,22 +732,22 @@ void application_init (gboolean is_direct) {
 void application_terminate (void) {
 	Application* _tmp0_ = NULL;
 	Application* _tmp1_ = NULL;
-#line 163 "/home/jens/Source/shotwell/src/Application.vala"
+#line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
-#line 163 "/home/jens/Source/shotwell/src/Application.vala"
+#line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = _tmp0_;
-#line 163 "/home/jens/Source/shotwell/src/Application.vala"
+#line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	application_exit (_tmp1_);
-#line 163 "/home/jens/Source/shotwell/src/Application.vala"
+#line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 720 "Application.c"
+#line 744 "Application.c"
 }
 
 
 static gpointer _application_ref0 (gpointer self) {
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	return self ? application_ref (self) : NULL;
-#line 727 "Application.c"
+#line 751 "Application.c"
 }
 
 
@@ -732,19 +756,19 @@ Application* application_get_instance (void) {
 	Application* _tmp0_ = NULL;
 	Application* _tmp1_ = NULL;
 	Application* _tmp2_ = NULL;
-#line 167 "/home/jens/Source/shotwell/src/Application.vala"
+#line 171 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_instance;
-#line 167 "/home/jens/Source/shotwell/src/Application.vala"
+#line 171 "/home/jens/Source/shotwell/src/Application.vala"
 	_vala_assert (_tmp0_ != NULL, "instance != null");
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = application_instance;
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _application_ref0 (_tmp1_);
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp2_;
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 748 "Application.c"
+#line 772 "Application.c"
 }
 
 
@@ -764,78 +788,78 @@ void application_start (Application* self, gchar** argv, int argv_length1) {
 	guint _tmp13_ = 0U;
 	GtkApplication* _tmp14_ = NULL;
 	guint _tmp15_ = 0U;
-#line 172 "/home/jens/Source/shotwell/src/Application.vala"
+#line 176 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 173 "/home/jens/Source/shotwell/src/Application.vala"
+#line 177 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->running;
-#line 173 "/home/jens/Source/shotwell/src/Application.vala"
+#line 177 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
-#line 174 "/home/jens/Source/shotwell/src/Application.vala"
+#line 178 "/home/jens/Source/shotwell/src/Application.vala"
 		return;
-#line 776 "Application.c"
+#line 800 "Application.c"
 	}
-#line 176 "/home/jens/Source/shotwell/src/Application.vala"
+#line 180 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->running = TRUE;
-#line 178 "/home/jens/Source/shotwell/src/Application.vala"
+#line 182 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_emit_by_name (self, "starting");
-#line 180 "/home/jens/Source/shotwell/src/Application.vala"
+#line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 180 "/home/jens/Source/shotwell/src/Application.vala"
+#line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _tmp1_;
-#line 180 "/home/jens/Source/shotwell/src/Application.vala"
+#line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	_vala_assert (_tmp2_ != NULL, "AppWindow.get_instance() != null");
-#line 180 "/home/jens/Source/shotwell/src/Application.vala"
+#line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (_tmp2_);
-#line 181 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = self->priv->system_app;
-#line 181 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 181 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp5_ = _tmp4_;
-#line 181 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 	gtk_application_add_window (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 181 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (_tmp5_);
-#line 182 "/home/jens/Source/shotwell/src/Application.vala"
+#line 186 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp6_ = self->priv->system_app;
-#line 182 "/home/jens/Source/shotwell/src/Application.vala"
+#line 186 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7_ = argv;
-#line 182 "/home/jens/Source/shotwell/src/Application.vala"
+#line 186 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7__length1 = argv_length1;
-#line 182 "/home/jens/Source/shotwell/src/Application.vala"
+#line 186 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp8_ = g_application_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_application_get_type (), GApplication), _tmp7__length1, _tmp7_);
-#line 182 "/home/jens/Source/shotwell/src/Application.vala"
+#line 186 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->system_app_run_retval = _tmp8_;
-#line 184 "/home/jens/Source/shotwell/src/Application.vala"
+#line 188 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp9_ = self->priv->direct;
-#line 184 "/home/jens/Source/shotwell/src/Application.vala"
+#line 188 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp9_) {
-#line 814 "Application.c"
+#line 838 "Application.c"
 		GtkApplication* _tmp10_ = NULL;
 		guint _tmp11_ = 0U;
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 189 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp10_ = self->priv->system_app;
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 189 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_parse_name ("command-line", g_application_get_type (), &_tmp11_, NULL, FALSE);
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 189 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _application_on_command_line_g_application_command_line, NULL);
-#line 823 "Application.c"
+#line 847 "Application.c"
 	}
-#line 188 "/home/jens/Source/shotwell/src/Application.vala"
+#line 192 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp12_ = self->priv->system_app;
-#line 188 "/home/jens/Source/shotwell/src/Application.vala"
+#line 192 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_parse_name ("activate", g_application_get_type (), &_tmp13_, NULL, FALSE);
-#line 188 "/home/jens/Source/shotwell/src/Application.vala"
+#line 192 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _application_on_activated_g_application_activate, NULL);
-#line 189 "/home/jens/Source/shotwell/src/Application.vala"
+#line 193 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp14_ = self->priv->system_app;
-#line 189 "/home/jens/Source/shotwell/src/Application.vala"
+#line 193 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_parse_name ("startup", g_application_get_type (), &_tmp15_, NULL, FALSE);
-#line 189 "/home/jens/Source/shotwell/src/Application.vala"
+#line 193 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _application_on_activated_g_application_startup, NULL);
-#line 191 "/home/jens/Source/shotwell/src/Application.vala"
+#line 195 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->running = FALSE;
-#line 839 "Application.c"
+#line 863 "Application.c"
 }
 
 
@@ -843,58 +867,58 @@ void application_exit (Application* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GtkApplication* _tmp3_ = NULL;
-#line 194 "/home/jens/Source/shotwell/src/Application.vala"
+#line 198 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 197 "/home/jens/Source/shotwell/src/Application.vala"
+#line 201 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = self->priv->exiting_fired;
-#line 197 "/home/jens/Source/shotwell/src/Application.vala"
+#line 201 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp1_) {
-#line 197 "/home/jens/Source/shotwell/src/Application.vala"
+#line 201 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp0_ = TRUE;
-#line 855 "Application.c"
+#line 879 "Application.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 197 "/home/jens/Source/shotwell/src/Application.vala"
+#line 201 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp2_ = self->priv->running;
-#line 197 "/home/jens/Source/shotwell/src/Application.vala"
+#line 201 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp0_ = !_tmp2_;
-#line 862 "Application.c"
+#line 886 "Application.c"
 	}
-#line 197 "/home/jens/Source/shotwell/src/Application.vala"
+#line 201 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
-#line 198 "/home/jens/Source/shotwell/src/Application.vala"
+#line 202 "/home/jens/Source/shotwell/src/Application.vala"
 		return;
-#line 868 "Application.c"
+#line 892 "Application.c"
 	}
-#line 200 "/home/jens/Source/shotwell/src/Application.vala"
+#line 204 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->exiting_fired = TRUE;
-#line 202 "/home/jens/Source/shotwell/src/Application.vala"
+#line 206 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_emit_by_name (self, "exiting", FALSE);
-#line 204 "/home/jens/Source/shotwell/src/Application.vala"
+#line 208 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = self->priv->system_app;
-#line 204 "/home/jens/Source/shotwell/src/Application.vala"
+#line 208 "/home/jens/Source/shotwell/src/Application.vala"
 	g_application_release (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_application_get_type (), GApplication));
-#line 878 "Application.c"
+#line 902 "Application.c"
 }
 
 
 void application_panic (Application* self) {
 	gboolean _tmp0_ = FALSE;
-#line 209 "/home/jens/Source/shotwell/src/Application.vala"
+#line 213 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 210 "/home/jens/Source/shotwell/src/Application.vala"
+#line 214 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->exiting_fired;
-#line 210 "/home/jens/Source/shotwell/src/Application.vala"
+#line 214 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp0_) {
-#line 211 "/home/jens/Source/shotwell/src/Application.vala"
+#line 215 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->exiting_fired = TRUE;
-#line 212 "/home/jens/Source/shotwell/src/Application.vala"
+#line 216 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_emit_by_name (self, "exiting", TRUE);
-#line 894 "Application.c"
+#line 918 "Application.c"
 	}
-#line 214 "/home/jens/Source/shotwell/src/Application.vala"
+#line 218 "/home/jens/Source/shotwell/src/Application.vala"
 	exit (1);
-#line 898 "Application.c"
+#line 922 "Application.c"
 }
 
 
@@ -914,29 +938,29 @@ guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, c
 	const gchar* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	guint _tmp6_ = 0U;
-#line 224 "/home/jens/Source/shotwell/src/Application.vala"
+#line 228 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (IS_APPLICATION (self), 0U);
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->system_app;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _tmp1_;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = what;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = reason;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp5_ = gtk_application_inhibit (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow), _tmp3_, _tmp4_);
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp6_ = _tmp5_;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (_tmp2_);
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp6_;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 229 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 940 "Application.c"
+#line 964 "Application.c"
 }
 
 
@@ -947,30 +971,30 @@ guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, c
 void application_uninhibit (Application* self, guint cookie) {
 	GtkApplication* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 232 "/home/jens/Source/shotwell/src/Application.vala"
+#line 236 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 233 "/home/jens/Source/shotwell/src/Application.vala"
+#line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->system_app;
-#line 233 "/home/jens/Source/shotwell/src/Application.vala"
+#line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = cookie;
-#line 233 "/home/jens/Source/shotwell/src/Application.vala"
+#line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	gtk_application_uninhibit (_tmp0_, _tmp1_);
-#line 959 "Application.c"
+#line 983 "Application.c"
 }
 
 
 gint application_get_run_return_value (Application* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 236 "/home/jens/Source/shotwell/src/Application.vala"
+#line 240 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (IS_APPLICATION (self), 0);
-#line 237 "/home/jens/Source/shotwell/src/Application.vala"
+#line 241 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->system_app_run_retval;
-#line 237 "/home/jens/Source/shotwell/src/Application.vala"
+#line 241 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp0_;
-#line 237 "/home/jens/Source/shotwell/src/Application.vala"
+#line 241 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 974 "Application.c"
+#line 998 "Application.c"
 }
 
 
@@ -989,7 +1013,7 @@ static void application_real_init_done (Application* self) {
 static void value_application_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	value->data[0].v_pointer = NULL;
-#line 993 "Application.c"
+#line 1017 "Application.c"
 }
 
 
@@ -998,7 +1022,7 @@ static void value_application_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_unref (value->data[0].v_pointer);
-#line 1002 "Application.c"
+#line 1026 "Application.c"
 	}
 }
 
@@ -1008,11 +1032,11 @@ static void value_application_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		dest_value->data[0].v_pointer = application_ref (src_value->data[0].v_pointer);
-#line 1012 "Application.c"
+#line 1036 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1016 "Application.c"
+#line 1040 "Application.c"
 	}
 }
 
@@ -1020,37 +1044,37 @@ static void value_application_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_application_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return value->data[0].v_pointer;
-#line 1024 "Application.c"
+#line 1048 "Application.c"
 }
 
 
 static gchar* value_application_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (collect_values[0].v_pointer) {
-#line 1031 "Application.c"
+#line 1055 "Application.c"
 		Application* object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1038 "Application.c"
+#line 1062 "Application.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1042 "Application.c"
+#line 1066 "Application.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = application_ref (object);
-#line 1046 "Application.c"
+#line 1070 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1050 "Application.c"
+#line 1074 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return NULL;
-#line 1054 "Application.c"
+#line 1078 "Application.c"
 }
 
 
@@ -1061,25 +1085,25 @@ static gchar* value_application_lcopy_value (const GValue* value, guint n_collec
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1065 "Application.c"
+#line 1089 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		*object_p = NULL;
-#line 1071 "Application.c"
+#line 1095 "Application.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1075 "Application.c"
+#line 1099 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		*object_p = application_ref (value->data[0].v_pointer);
-#line 1079 "Application.c"
+#line 1103 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return NULL;
-#line 1083 "Application.c"
+#line 1107 "Application.c"
 }
 
 
@@ -1093,7 +1117,7 @@ GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return G_PARAM_SPEC (spec);
-#line 1097 "Application.c"
+#line 1121 "Application.c"
 }
 
 
@@ -1102,7 +1126,7 @@ gpointer value_get_application (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APPLICATION), NULL);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return value->data[0].v_pointer;
-#line 1106 "Application.c"
+#line 1130 "Application.c"
 }
 
 
@@ -1122,17 +1146,17 @@ void value_set_application (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_ref (value->data[0].v_pointer);
-#line 1126 "Application.c"
+#line 1150 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1130 "Application.c"
+#line 1154 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_unref (old);
-#line 1136 "Application.c"
+#line 1160 "Application.c"
 	}
 }
 
@@ -1151,17 +1175,17 @@ void value_take_application (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = v_object;
-#line 1155 "Application.c"
+#line 1179 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1159 "Application.c"
+#line 1183 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_unref (old);
-#line 1165 "Application.c"
+#line 1189 "Application.c"
 	}
 }
 
@@ -1185,7 +1209,7 @@ static void application_class_init (ApplicationClass * klass) {
 	g_signal_new ("exiting", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, exiting), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_new ("init_done", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, init_done), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1189 "Application.c"
+#line 1213 "Application.c"
 }
 
 
@@ -1204,7 +1228,7 @@ static void application_instance_init (Application * self) {
 	self->priv->exiting_fired = FALSE;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	self->ref_count = 1;
-#line 1208 "Application.c"
+#line 1232 "Application.c"
 }
 
 
@@ -1216,7 +1240,7 @@ static void application_finalize (Application* obj) {
 	g_signal_handlers_destroy (self);
 #line 9 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (self->priv->system_app);
-#line 1220 "Application.c"
+#line 1244 "Application.c"
 }
 
 
@@ -1241,7 +1265,7 @@ gpointer application_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return instance;
-#line 1245 "Application.c"
+#line 1269 "Application.c"
 }
 
 
@@ -1254,7 +1278,7 @@ void application_unref (gpointer instance) {
 		APPLICATION_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1258 "Application.c"
+#line 1282 "Application.c"
 	}
 }
 
diff --git a/src/Application.vala b/src/Application.vala
index 4a24fd4..6e6ba85 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -103,6 +103,10 @@ public class Application {
         get_instance().system_app.set_menubar (model);
     }
 
+    public static void set_appmenu (GLib.MenuModel? model) {
+        get_instance().system_app.set_app_menu (model);
+    }
+
     /**
      * @brief Signal handler for GApplication's 'command-line' signal.
      *
diff --git a/src/BatchImport.c b/src/BatchImport.c
index f8b107c..bc67168 100644
--- a/src/BatchImport.c
+++ b/src/BatchImport.c
@@ -1,4 +1,4 @@
-/* BatchImport.c generated by valac 0.34.2, the Vala compiler
+/* BatchImport.c generated by valac 0.32.1, the Vala compiler
  * generated from BatchImport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -5472,7 +5472,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 #line 5473 "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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
@@ -10413,7 +10413,7 @@ static void batch_import_class_init (BatchImportClass * klass) {
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_new ("progress", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT64_UINT64, G_TYPE_NONE, 2, G_TYPE_UINT64, G_TYPE_UINT64);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_new ("imported", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, gdk_pixbuf_get_type (), G_TYPE_INT);
+	g_signal_new ("imported", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, GDK_TYPE_PIXBUF, G_TYPE_INT);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_new ("fatal_error", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__ENUM_STRING, G_TYPE_NONE, 2, TYPE_IMPORT_RESULT, G_TYPE_STRING);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10460,7 +10460,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, g_free, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
diff --git a/src/Box.c b/src/Box.c
index 20eb63b..0ebb6da 100644
--- a/src/Box.c
+++ b/src/Box.c
@@ -1,4 +1,4 @@
-/* Box.c generated by valac 0.34.2, the Vala compiler
+/* Box.c generated by valac 0.32.1, 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 17f79b6..7c3ab70 100644
--- a/src/CheckerboardLayout.c
+++ b/src/CheckerboardLayout.c
@@ -1,4 +1,4 @@
-/* CheckerboardLayout.c generated by valac 0.34.2, the Vala compiler
+/* CheckerboardLayout.c generated by valac 0.32.1, the Vala compiler
  * generated from CheckerboardLayout.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1384,11 +1384,11 @@ void checkerboard_item_text_unref (gpointer instance) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 1394 "CheckerboardLayout.c"
 	{
@@ -1403,73 +1403,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1425 "CheckerboardLayout.c"
 				goto __catch239_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 1434 "CheckerboardLayout.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1450 "CheckerboardLayout.c"
 				goto __catch239_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 1461 "CheckerboardLayout.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1475 "CheckerboardLayout.c"
 	}
@@ -1477,24 +1477,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch239_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 1489 "CheckerboardLayout.c"
 	}
 	__finally239:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
 #line 1500 "CheckerboardLayout.c"
 	}
@@ -7296,15 +7296,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 7310 "CheckerboardLayout.c"
 }
@@ -7317,37 +7317,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 7333 "CheckerboardLayout.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 7341 "CheckerboardLayout.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 7353 "CheckerboardLayout.c"
 	}
@@ -7367,112 +7367,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 7377 "CheckerboardLayout.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 7383 "CheckerboardLayout.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 7387 "CheckerboardLayout.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 7391 "CheckerboardLayout.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 7403 "CheckerboardLayout.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 7413 "CheckerboardLayout.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 7419 "CheckerboardLayout.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 7433 "CheckerboardLayout.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 7443 "CheckerboardLayout.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 7449 "CheckerboardLayout.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 7458 "CheckerboardLayout.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 7478 "CheckerboardLayout.c"
 }
diff --git a/src/CollectionPage.c b/src/CollectionPage.c
index 07170e5..c778508 100644
--- a/src/CollectionPage.c
+++ b/src/CollectionPage.c
@@ -1,4 +1,4 @@
-/* CollectionPage.c generated by valac 0.34.2, the Vala compiler
+/* CollectionPage.c generated by valac 0.32.1, the Vala compiler
  * generated from CollectionPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -614,16 +614,6 @@ typedef struct _AdjustDateTimeDialogClass AdjustDateTimeDialogClass;
 typedef struct _AdjustDateTimePhotosCommand AdjustDateTimePhotosCommand;
 typedef struct _AdjustDateTimePhotosCommandClass AdjustDateTimePhotosCommandClass;
 
-#define TYPE_SET_BACKGROUND_DIALOG (set_background_dialog_get_type ())
-#define SET_BACKGROUND_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog))
-#define SET_BACKGROUND_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialogClass))
-#define IS_SET_BACKGROUND_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SET_BACKGROUND_DIALOG))
-#define IS_SET_BACKGROUND_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SET_BACKGROUND_DIALOG))
-#define SET_BACKGROUND_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialogClass))
-
-typedef struct _SetBackgroundDialog SetBackgroundDialog;
-typedef struct _SetBackgroundDialogClass SetBackgroundDialogClass;
-
 #define TYPE_SET_BACKGROUND_PHOTO_DIALOG (set_background_photo_dialog_get_type ())
 #define SET_BACKGROUND_PHOTO_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog))
 #define SET_BACKGROUND_PHOTO_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogClass))
@@ -633,7 +623,6 @@ typedef struct _SetBackgroundDialogClass SetBackgroundDialogClass;
 
 typedef struct _SetBackgroundPhotoDialog SetBackgroundPhotoDialog;
 typedef struct _SetBackgroundPhotoDialogClass SetBackgroundPhotoDialogClass;
-#define _set_background_dialog_unref0(var) ((var == NULL) ? NULL : (var = (set_background_dialog_unref (var), NULL)))
 
 #define TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG (set_background_slideshow_dialog_get_type ())
 #define SET_BACKGROUND_SLIDESHOW_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog))
@@ -1218,6 +1207,9 @@ gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self);
 static gboolean collection_page_can_revert_selected (CollectionPage* self);
 gboolean photo_has_color_adjustments (Photo* self);
 gboolean pixel_transformation_bundle_has_copied_color_adjustments (void);
+#define RESOURCES_SET_BACKGROUND_MENU _ ("Set as _Desktop Background")
+#define RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU _ ("Set as _Desktop Slideshow…")
+void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label);
 gboolean data_view_is_selected (DataView* self);
 gboolean alteration_has_subject (Alteration* self, const gchar* subject);
 GType library_photo_get_type (void) G_GNUC_CONST;
@@ -1349,13 +1341,6 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gchar* resources_launch_editor_failed (GError* err);
 void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos);
-gpointer set_background_dialog_ref (gpointer instance);
-void set_background_dialog_unref (gpointer instance);
-GParamSpec* param_spec_set_background_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_set_background_dialog (GValue* value, gpointer v_object);
-void value_take_set_background_dialog (GValue* value, gpointer v_object);
-gpointer value_get_set_background_dialog (const GValue* value);
-GType set_background_dialog_get_type (void) G_GNUC_CONST;
 GType set_background_photo_dialog_get_type (void) G_GNUC_CONST;
 SetBackgroundPhotoDialog* set_background_photo_dialog_new (void);
 SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type);
@@ -1398,7 +1383,7 @@ static const GActionEntry COLLECTION_PAGE_entries[16] = {{"Print", _collection_p
 static gpointer _g_object_ref0 (gpointer self) {
 #line 11 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1402 "CollectionPage.c"
+#line 1387 "CollectionPage.c"
 }
 
 
@@ -1420,14 +1405,14 @@ CollectionViewManager* collection_view_manager_construct (GType object_type, Col
 	self->priv->page = _tmp1_;
 #line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self;
-#line 1424 "CollectionPage.c"
+#line 1409 "CollectionPage.c"
 }
 
 
 CollectionViewManager* collection_view_manager_new (CollectionPage* page) {
 #line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return collection_view_manager_construct (TYPE_COLLECTION_VIEW_MANAGER, page);
-#line 1431 "CollectionPage.c"
+#line 1416 "CollectionPage.c"
 }
 
 
@@ -1451,7 +1436,7 @@ static DataView* collection_view_manager_real_create_view (ViewManager* base, Da
 	result = _tmp2_;
 #line 15 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1455 "CollectionPage.c"
+#line 1440 "CollectionPage.c"
 }
 
 
@@ -1464,14 +1449,14 @@ static void collection_view_manager_class_init (CollectionViewManagerClass * kla
 	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;
-#line 1468 "CollectionPage.c"
+#line 1453 "CollectionPage.c"
 }
 
 
 static void collection_view_manager_instance_init (CollectionViewManager * self) {
 #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv = COLLECTION_VIEW_MANAGER_GET_PRIVATE (self);
-#line 1475 "CollectionPage.c"
+#line 1460 "CollectionPage.c"
 }
 
 
@@ -1483,7 +1468,7 @@ static void collection_view_manager_finalize (ViewManager* obj) {
 	_g_object_unref0 (self->priv->page);
 #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	VIEW_MANAGER_CLASS (collection_view_manager_parent_class)->finalize (obj);
-#line 1487 "CollectionPage.c"
+#line 1472 "CollectionPage.c"
 }
 
 
@@ -1502,126 +1487,126 @@ GType collection_view_manager_get_type (void) {
 static void _collection_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_print ((CollectionPage*) self);
-#line 1506 "CollectionPage.c"
+#line 1491 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_publish ((CollectionPage*) self);
-#line 1513 "CollectionPage.c"
+#line 1498 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_rotate_clockwise ((CollectionPage*) self);
-#line 1520 "CollectionPage.c"
+#line 1505 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_rotate_counterclockwise ((CollectionPage*) self);
-#line 1527 "CollectionPage.c"
+#line 1512 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_flip_horizontally ((CollectionPage*) self);
-#line 1534 "CollectionPage.c"
+#line 1519 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_flip_vertically ((CollectionPage*) self);
-#line 1541 "CollectionPage.c"
+#line 1526 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_enhance ((CollectionPage*) self);
-#line 1548 "CollectionPage.c"
+#line 1533 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_copy_adjustments ((CollectionPage*) self);
-#line 1555 "CollectionPage.c"
+#line 1540 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_paste_adjustments ((CollectionPage*) self);
-#line 1562 "CollectionPage.c"
+#line 1547 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_revert ((CollectionPage*) self);
-#line 1569 "CollectionPage.c"
+#line 1554 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_set_background ((CollectionPage*) self);
-#line 1576 "CollectionPage.c"
+#line 1561 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_duplicate_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_duplicate_photo ((CollectionPage*) self);
-#line 1583 "CollectionPage.c"
+#line 1568 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_adjust_date_time ((CollectionPage*) self);
-#line 1590 "CollectionPage.c"
+#line 1575 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_external_edit ((CollectionPage*) self);
-#line 1597 "CollectionPage.c"
+#line 1582 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_external_edit_raw ((CollectionPage*) self);
-#line 1604 "CollectionPage.c"
+#line 1589 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_slideshow ((CollectionPage*) self);
-#line 1611 "CollectionPage.c"
+#line 1596 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 35 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_photos_altered ((CollectionPage*) self, items);
-#line 1618 "CollectionPage.c"
+#line 1603 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) {
 #line 43 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_external_app_changed ((CollectionPage*) self);
-#line 1625 "CollectionPage.c"
+#line 1610 "CollectionPage.c"
 }
 
 
@@ -1662,7 +1647,7 @@ CollectionPage* collection_page_construct (GType object_type, const gchar* page_
 	_g_object_unref0 (_tmp4_);
 #line 32 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self;
-#line 1666 "CollectionPage.c"
+#line 1651 "CollectionPage.c"
 }
 
 
@@ -1678,7 +1663,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp0_ == NULL) {
-#line 1682 "CollectionPage.c"
+#line 1667 "CollectionPage.c"
 		GtkToolbar* _tmp1_ = NULL;
 		GtkToolbar* _tmp2_ = NULL;
 		GtkSeparatorToolItem* separator = NULL;
@@ -1779,7 +1764,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 		_g_object_unref0 (drawn_separator);
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (separator);
-#line 1783 "CollectionPage.c"
+#line 1768 "CollectionPage.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
@@ -1789,7 +1774,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 	result = _tmp21_;
 #line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1793 "CollectionPage.c"
+#line 1778 "CollectionPage.c"
 }
 
 
@@ -1822,12 +1807,12 @@ static InjectionGroup* collection_page_create_file_menu_injectables (void) {
 #line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _ ("Set as _Desktop Background");
 #line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _tmp4_, "SetBackground", NULL);
+	injection_group_add_menu_item (group, _tmp4_, "SetBackground", "<Primary>b");
 #line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
 #line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1831 "CollectionPage.c"
+#line 1816 "CollectionPage.c"
 }
 
 
@@ -1848,7 +1833,7 @@ static InjectionGroup* collection_page_create_edit_menu_injectables (void) {
 	result = group;
 #line 88 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1852 "CollectionPage.c"
+#line 1837 "CollectionPage.c"
 }
 
 
@@ -1876,7 +1861,7 @@ static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (
 	result = group;
 #line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1880 "CollectionPage.c"
+#line 1865 "CollectionPage.c"
 }
 
 
@@ -1936,7 +1921,7 @@ static InjectionGroup* collection_page_create_photos_menu_edits_injectables (voi
 	result = group;
 #line 123 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1940 "CollectionPage.c"
+#line 1925 "CollectionPage.c"
 }
 
 
@@ -1957,7 +1942,7 @@ static InjectionGroup* collection_page_create_photos_menu_date_injectables (void
 	result = group;
 #line 131 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1961 "CollectionPage.c"
+#line 1946 "CollectionPage.c"
 }
 
 
@@ -1988,7 +1973,7 @@ static InjectionGroup* collection_page_create_photos_menu_externals_injectables
 	result = group;
 #line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1992 "CollectionPage.c"
+#line 1977 "CollectionPage.c"
 }
 
 
@@ -2008,7 +1993,7 @@ static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList*
 	_tmp1_ = ui_filenames;
 #line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "collection.ui");
-#line 2012 "CollectionPage.c"
+#line 1997 "CollectionPage.c"
 }
 
 
@@ -2028,7 +2013,7 @@ static void collection_page_real_add_actions (Page* base) {
 	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), COLLECTION_PAGE_entries, G_N_ELEMENTS (COLLECTION_PAGE_entries), self);
 #line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2032 "CollectionPage.c"
+#line 2017 "CollectionPage.c"
 }
 
 
@@ -2039,13 +2024,13 @@ static void _vala_array_add76 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2043 "CollectionPage.c"
+#line 2028 "CollectionPage.c"
 	}
 #line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2049 "CollectionPage.c"
+#line 2034 "CollectionPage.c"
 }
 
 
@@ -2056,13 +2041,13 @@ static void _vala_array_add77 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2060 "CollectionPage.c"
+#line 2045 "CollectionPage.c"
 	}
 #line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2066 "CollectionPage.c"
+#line 2051 "CollectionPage.c"
 }
 
 
@@ -2073,13 +2058,13 @@ static void _vala_array_add78 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2077 "CollectionPage.c"
+#line 2062 "CollectionPage.c"
 	}
 #line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2083 "CollectionPage.c"
+#line 2068 "CollectionPage.c"
 }
 
 
@@ -2090,13 +2075,13 @@ static void _vala_array_add79 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2094 "CollectionPage.c"
+#line 2079 "CollectionPage.c"
 	}
 #line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2100 "CollectionPage.c"
+#line 2085 "CollectionPage.c"
 }
 
 
@@ -2107,13 +2092,13 @@ static void _vala_array_add80 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2111 "CollectionPage.c"
+#line 2096 "CollectionPage.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2117 "CollectionPage.c"
+#line 2102 "CollectionPage.c"
 }
 
 
@@ -2124,13 +2109,13 @@ static void _vala_array_add81 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2128 "CollectionPage.c"
+#line 2113 "CollectionPage.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2134 "CollectionPage.c"
+#line 2119 "CollectionPage.c"
 }
 
 
@@ -2228,13 +2213,13 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 	if (result_length1) {
 #line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*result_length1 = _tmp14__length1;
-#line 2232 "CollectionPage.c"
+#line 2217 "CollectionPage.c"
 	}
 #line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp14_;
 #line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2238 "CollectionPage.c"
+#line 2223 "CollectionPage.c"
 }
 
 
@@ -2268,7 +2253,7 @@ static gboolean collection_page_selection_has_video (CollectionPage* self) {
 	result = _tmp5_;
 #line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2272 "CollectionPage.c"
+#line 2257 "CollectionPage.c"
 }
 
 
@@ -2302,7 +2287,7 @@ static gboolean collection_page_page_has_photo (CollectionPage* self) {
 	result = _tmp5_;
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2306 "CollectionPage.c"
+#line 2291 "CollectionPage.c"
 }
 
 
@@ -2336,7 +2321,7 @@ static gboolean collection_page_selection_has_photo (CollectionPage* self) {
 	result = _tmp5_;
 #line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2340 "CollectionPage.c"
+#line 2325 "CollectionPage.c"
 }
 
 
@@ -2366,7 +2351,7 @@ static void collection_page_real_init_actions (Page* base, gint selected_count,
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", TRUE);
 #line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", TRUE);
-#line 2370 "CollectionPage.c"
+#line 2355 "CollectionPage.c"
 }
 
 
@@ -2448,7 +2433,7 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	if (_tmp4_) {
 #line 220 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 2452 "CollectionPage.c"
+#line 2437 "CollectionPage.c"
 	}
 #line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = selected_count;
@@ -2470,7 +2455,7 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp9_ = has_selected;
 #line 229 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_) {
-#line 2474 "CollectionPage.c"
+#line 2459 "CollectionPage.c"
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		DataView* _tmp12_ = NULL;
@@ -2502,7 +2487,7 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		if (_tmp16_) {
 #line 231 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			primary_is_video = TRUE;
-#line 2506 "CollectionPage.c"
+#line 2491 "CollectionPage.c"
 		}
 	}
 #line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2517,17 +2502,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp20_ = has_selected;
 #line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp20_) {
-#line 2521 "CollectionPage.c"
+#line 2506 "CollectionPage.c"
 		gboolean _tmp21_ = FALSE;
 #line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp21_ = selection_has_videos;
 #line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = !_tmp21_;
-#line 2527 "CollectionPage.c"
+#line 2512 "CollectionPage.c"
 	} else {
 #line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = FALSE;
-#line 2531 "CollectionPage.c"
+#line 2516 "CollectionPage.c"
 	}
 #line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Duplicate", _tmp19_);
@@ -2539,7 +2524,7 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp24_ = one_selected;
 #line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp24_) {
-#line 2543 "CollectionPage.c"
+#line 2528 "CollectionPage.c"
 		ConfigFacade* _tmp25_ = NULL;
 		ConfigFacade* _tmp26_ = NULL;
 		gchar* _tmp27_ = NULL;
@@ -2561,11 +2546,11 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		_g_free0 (_tmp28_);
 #line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 2565 "CollectionPage.c"
+#line 2550 "CollectionPage.c"
 	} else {
 #line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = FALSE;
-#line 2569 "CollectionPage.c"
+#line 2554 "CollectionPage.c"
 	}
 #line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp23_);
@@ -2573,21 +2558,21 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp33_ = one_selected;
 #line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp33_) {
-#line 2577 "CollectionPage.c"
+#line 2562 "CollectionPage.c"
 		gboolean _tmp34_ = FALSE;
 #line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp34_ = primary_is_video;
 #line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp32_ = !_tmp34_;
-#line 2583 "CollectionPage.c"
+#line 2568 "CollectionPage.c"
 	} else {
 #line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp32_ = FALSE;
-#line 2587 "CollectionPage.c"
+#line 2572 "CollectionPage.c"
 	}
 #line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp32_) {
-#line 2591 "CollectionPage.c"
+#line 2576 "CollectionPage.c"
 		ViewCollection* _tmp35_ = NULL;
 		ViewCollection* _tmp36_ = NULL;
 		DataView* _tmp37_ = NULL;
@@ -2617,15 +2602,15 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		_g_object_unref0 (_tmp38_);
 #line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp36_);
-#line 2621 "CollectionPage.c"
+#line 2606 "CollectionPage.c"
 	} else {
 #line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp31_ = FALSE;
-#line 2625 "CollectionPage.c"
+#line 2610 "CollectionPage.c"
 	}
 #line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp31_) {
-#line 2629 "CollectionPage.c"
+#line 2614 "CollectionPage.c"
 		ConfigFacade* _tmp42_ = NULL;
 		ConfigFacade* _tmp43_ = NULL;
 		gchar* _tmp44_ = NULL;
@@ -2647,11 +2632,11 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		_g_free0 (_tmp45_);
 #line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp43_);
-#line 2651 "CollectionPage.c"
+#line 2636 "CollectionPage.c"
 	} else {
 #line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp30_ = FALSE;
-#line 2655 "CollectionPage.c"
+#line 2640 "CollectionPage.c"
 	}
 #line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp30_);
@@ -2659,17 +2644,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp48_ = selection_has_videos;
 #line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp48_) {
-#line 2663 "CollectionPage.c"
+#line 2648 "CollectionPage.c"
 		gboolean _tmp49_ = FALSE;
 #line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp49_ = collection_page_can_revert_selected (self);
 #line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp47_ = _tmp49_;
-#line 2669 "CollectionPage.c"
+#line 2654 "CollectionPage.c"
 	} else {
 #line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp47_ = FALSE;
-#line 2673 "CollectionPage.c"
+#line 2658 "CollectionPage.c"
 	}
 #line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp47_);
@@ -2677,17 +2662,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp51_ = selection_has_videos;
 #line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp51_) {
-#line 2681 "CollectionPage.c"
+#line 2666 "CollectionPage.c"
 		gboolean _tmp52_ = FALSE;
 #line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp52_ = has_selected;
 #line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = _tmp52_;
-#line 2687 "CollectionPage.c"
+#line 2672 "CollectionPage.c"
 	} else {
 #line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = FALSE;
-#line 2691 "CollectionPage.c"
+#line 2676 "CollectionPage.c"
 	}
 #line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp50_);
@@ -2695,21 +2680,21 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp55_ = selection_has_videos;
 #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp55_) {
-#line 2699 "CollectionPage.c"
+#line 2684 "CollectionPage.c"
 		gboolean _tmp56_ = FALSE;
 #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp56_ = one_selected;
 #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp54_ = _tmp56_;
-#line 2705 "CollectionPage.c"
+#line 2690 "CollectionPage.c"
 	} else {
 #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp54_ = FALSE;
-#line 2709 "CollectionPage.c"
+#line 2694 "CollectionPage.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp54_) {
-#line 2713 "CollectionPage.c"
+#line 2698 "CollectionPage.c"
 		ViewCollection* _tmp57_ = NULL;
 		ViewCollection* _tmp58_ = NULL;
 		DataView* _tmp59_ = NULL;
@@ -2739,11 +2724,11 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		_g_object_unref0 (_tmp60_);
 #line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp58_);
-#line 2743 "CollectionPage.c"
+#line 2728 "CollectionPage.c"
 	} else {
 #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp53_ = FALSE;
-#line 2747 "CollectionPage.c"
+#line 2732 "CollectionPage.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp53_);
@@ -2751,31 +2736,31 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp66_ = selection_has_videos;
 #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp66_) {
-#line 2755 "CollectionPage.c"
+#line 2740 "CollectionPage.c"
 		gboolean _tmp67_ = FALSE;
 #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp67_ = has_selected;
 #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp65_ = _tmp67_;
-#line 2761 "CollectionPage.c"
+#line 2746 "CollectionPage.c"
 	} else {
 #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp65_ = FALSE;
-#line 2765 "CollectionPage.c"
+#line 2750 "CollectionPage.c"
 	}
 #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp65_) {
-#line 2769 "CollectionPage.c"
+#line 2754 "CollectionPage.c"
 		gboolean _tmp68_ = FALSE;
 #line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp68_ = pixel_transformation_bundle_has_copied_color_adjustments ();
 #line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp64_ = _tmp68_;
-#line 2775 "CollectionPage.c"
+#line 2760 "CollectionPage.c"
 	} else {
 #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp64_ = FALSE;
-#line 2779 "CollectionPage.c"
+#line 2764 "CollectionPage.c"
 	}
 #line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp64_);
@@ -2783,17 +2768,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp70_ = selection_has_videos;
 #line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp70_) {
-#line 2787 "CollectionPage.c"
+#line 2772 "CollectionPage.c"
 		gboolean _tmp71_ = FALSE;
 #line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp71_ = has_selected;
 #line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp69_ = _tmp71_;
-#line 2793 "CollectionPage.c"
+#line 2778 "CollectionPage.c"
 	} else {
 #line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp69_ = FALSE;
-#line 2797 "CollectionPage.c"
+#line 2782 "CollectionPage.c"
 	}
 #line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp69_);
@@ -2801,17 +2786,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp73_ = selection_has_videos;
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp73_) {
-#line 2805 "CollectionPage.c"
+#line 2790 "CollectionPage.c"
 		gboolean _tmp74_ = FALSE;
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp74_ = has_selected;
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp72_ = _tmp74_;
-#line 2811 "CollectionPage.c"
+#line 2796 "CollectionPage.c"
 	} else {
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp72_ = FALSE;
-#line 2815 "CollectionPage.c"
+#line 2800 "CollectionPage.c"
 	}
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp72_);
@@ -2819,17 +2804,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp76_ = selection_has_videos;
 #line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp76_) {
-#line 2823 "CollectionPage.c"
+#line 2808 "CollectionPage.c"
 		gboolean _tmp77_ = FALSE;
 #line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp77_ = has_selected;
 #line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp75_ = _tmp77_;
-#line 2829 "CollectionPage.c"
+#line 2814 "CollectionPage.c"
 	} else {
 #line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp75_ = FALSE;
-#line 2833 "CollectionPage.c"
+#line 2818 "CollectionPage.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp75_);
@@ -2837,17 +2822,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp79_ = selection_has_videos;
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp79_) {
-#line 2841 "CollectionPage.c"
+#line 2826 "CollectionPage.c"
 		gboolean _tmp80_ = FALSE;
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp80_ = has_selected;
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp78_ = _tmp80_;
-#line 2847 "CollectionPage.c"
+#line 2832 "CollectionPage.c"
 	} else {
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp78_ = FALSE;
-#line 2851 "CollectionPage.c"
+#line 2836 "CollectionPage.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp78_);
@@ -2871,17 +2856,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp86_ = page_has_photos;
 #line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp86_) {
-#line 2875 "CollectionPage.c"
+#line 2860 "CollectionPage.c"
 		gboolean _tmp87_ = FALSE;
 #line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp87_ = primary_is_video;
 #line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp85_ = !_tmp87_;
-#line 2881 "CollectionPage.c"
+#line 2866 "CollectionPage.c"
 	} else {
 #line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp85_ = FALSE;
-#line 2885 "CollectionPage.c"
+#line 2870 "CollectionPage.c"
 	}
 #line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", _tmp85_);
@@ -2889,17 +2874,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp89_ = selection_has_videos;
 #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp89_) {
-#line 2893 "CollectionPage.c"
+#line 2878 "CollectionPage.c"
 		gboolean _tmp90_ = FALSE;
 #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp90_ = has_selected;
 #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp88_ = _tmp90_;
-#line 2899 "CollectionPage.c"
+#line 2884 "CollectionPage.c"
 	} else {
 #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp88_ = FALSE;
-#line 2903 "CollectionPage.c"
+#line 2888 "CollectionPage.c"
 	}
 #line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp88_);
@@ -2911,17 +2896,17 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp93_ = selection_has_videos;
 #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp93_) {
-#line 2915 "CollectionPage.c"
+#line 2900 "CollectionPage.c"
 		gboolean _tmp94_ = FALSE;
 #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp94_ = has_selected;
 #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp92_ = _tmp94_;
-#line 2921 "CollectionPage.c"
+#line 2906 "CollectionPage.c"
 	} else {
 #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp92_ = FALSE;
-#line 2925 "CollectionPage.c"
+#line 2910 "CollectionPage.c"
 	}
 #line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp92_);
@@ -2929,19 +2914,47 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	_tmp95_ = has_selected;
 #line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp95_) {
+#line 2918 "CollectionPage.c"
+		const gchar* _tmp96_ = NULL;
+		gboolean _tmp97_ = FALSE;
+		gchar* label = NULL;
+		gchar* _tmp98_ = NULL;
+		const gchar* _tmp99_ = NULL;
 #line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_debug ("CollectionPage.vala:271: Setting action label for SetBackground...");
-#line 2935 "CollectionPage.c"
+#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp97_ = one_selected;
+#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		if (_tmp97_) {
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp96_ = RESOURCES_SET_BACKGROUND_MENU;
+#line 2932 "CollectionPage.c"
+		} else {
+#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp96_ = RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU;
+#line 2936 "CollectionPage.c"
+		}
+#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp98_ = g_strdup (_tmp96_);
+#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		label = _tmp98_;
+#line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp99_ = label;
+#line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp99_);
+#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_free0 (label);
+#line 2948 "CollectionPage.c"
 	}
 }
 
 
 static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* altered) {
-#line 281 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 281 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 2945 "CollectionPage.c"
+#line 2958 "CollectionPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -2950,25 +2963,25 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 		GeeSet* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = altered;
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = _tmp1_;
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_object_it = _tmp5_;
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 2972 "CollectionPage.c"
+#line 2985 "CollectionPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -2988,120 +3001,120 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 			gboolean _tmp24_ = FALSE;
 			LibraryPhoto* _tmp25_ = NULL;
 			gboolean _tmp26_ = FALSE;
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp6_ = _object_it;
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp7_) {
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3000 "CollectionPage.c"
+#line 3013 "CollectionPage.c"
 			}
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _object_it;
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			object = (DataObject*) _tmp9_;
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = object;
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			view = _tmp11_;
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = view;
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = data_view_is_selected (_tmp13_);
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp14_) {
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp12_ = TRUE;
-#line 3022 "CollectionPage.c"
+#line 3035 "CollectionPage.c"
 			} else {
 				GeeMap* _tmp15_ = NULL;
 				DataView* _tmp16_ = NULL;
 				gpointer _tmp17_ = NULL;
 				Alteration* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = altered;
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp16_ = view;
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp17_ = gee_map_get (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = (Alteration*) _tmp17_;
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp19_ = alteration_has_subject (_tmp18_, "image");
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp12_ = !_tmp19_;
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_alteration_unref0 (_tmp18_);
-#line 3043 "CollectionPage.c"
+#line 3056 "CollectionPage.c"
 			}
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp12_) {
-#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (view);
-#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3053 "CollectionPage.c"
+#line 3066 "CollectionPage.c"
 			}
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = view;
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = data_view_get_source (_tmp20_);
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL;
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp22_ == NULL) {
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp21_);
-#line 3065 "CollectionPage.c"
+#line 3078 "CollectionPage.c"
 			}
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp22_;
-#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp23_ = photo;
-#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp23_ == NULL) {
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (view);
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3081 "CollectionPage.c"
+#line 3094 "CollectionPage.c"
 			}
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = collection_page_can_revert_selected (self);
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp24_);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp25_ = photo;
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp26_ = photo_has_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo));
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp26_);
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (view);
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (object);
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			break;
-#line 3101 "CollectionPage.c"
+#line 3114 "CollectionPage.c"
 		}
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_object_it);
-#line 3105 "CollectionPage.c"
+#line 3118 "CollectionPage.c"
 	}
 }
 
@@ -3111,48 +3124,48 @@ static void collection_page_on_print (CollectionPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 3129 "CollectionPage.c"
+#line 3142 "CollectionPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 3156 "CollectionPage.c"
+#line 3169 "CollectionPage.c"
 	}
 }
 
@@ -3165,52 +3178,52 @@ static void collection_page_on_external_app_changed (CollectionPage* self) {
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
 	gint _tmp5_ = 0;
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selected_count = _tmp3_;
-#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = selected_count;
-#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_ == 1) {
-#line 3187 "CollectionPage.c"
+#line 3200 "CollectionPage.c"
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = _tmp8_;
-#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = g_strcmp0 (_tmp9_, "") != 0;
-#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp9_);
-#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3206 "CollectionPage.c"
+#line 3219 "CollectionPage.c"
 	} else {
-#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = FALSE;
-#line 3210 "CollectionPage.c"
+#line 3223 "CollectionPage.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp4_);
-#line 3214 "CollectionPage.c"
+#line 3227 "CollectionPage.c"
 }
 
 
@@ -3232,162 +3245,162 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 	gchar* _tmp11_ = NULL;
 	gchar* _tmp12_ = NULL;
 	CheckerboardPageActivator _tmp13_ = 0;
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = item;
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL, Thumbnail));
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	thumbnail = _tmp1_;
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = thumbnail;
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = thumbnail_get_media_source (_tmp2_);
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _tmp3_;
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_VIDEO);
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_) {
-#line 330 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		media_page_on_play_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage));
-#line 331 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 331 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3266 "CollectionPage.c"
+#line 3279 "CollectionPage.c"
 	}
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = thumbnail;
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = thumbnail_get_media_source (_tmp6_);
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp7_) : NULL;
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_ == NULL) {
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3278 "CollectionPage.c"
+#line 3291 "CollectionPage.c"
 	}
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp8_;
-#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = photo;
-#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_ == NULL) {
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3292 "CollectionPage.c"
+#line 3305 "CollectionPage.c"
 	}
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = _tmp11_;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	g_debug ("CollectionPage.vala:339: activating %s", _tmp12_);
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	g_debug ("CollectionPage.vala:337: activating %s", _tmp12_);
+#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_free0 (_tmp12_);
-#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = activator;
-#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp13_ == CHECKERBOARD_PAGE_ACTIVATOR_MOUSE) {
-#line 3308 "CollectionPage.c"
+#line 3321 "CollectionPage.c"
 		CheckerboardPageKeyboardModifiers _tmp14_ = {0};
 		gboolean _tmp15_ = FALSE;
-#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = *modifiers;
-#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = _tmp14_.super_pressed;
-#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp15_) {
-#line 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			collection_page_on_external_edit (self);
-#line 3319 "CollectionPage.c"
+#line 3332 "CollectionPage.c"
 		} else {
 			LibraryWindow* _tmp16_ = NULL;
 			LibraryWindow* _tmp17_ = NULL;
 			LibraryPhoto* _tmp18_ = NULL;
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = library_window_get_app ();
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp16_;
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = photo;
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			library_window_switch_to_photo_page (_tmp17_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo));
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp17_);
-#line 3334 "CollectionPage.c"
+#line 3347 "CollectionPage.c"
 		}
 	} else {
 		CheckerboardPageActivator _tmp19_ = 0;
-#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = activator;
-#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp19_ == CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD) {
-#line 3342 "CollectionPage.c"
+#line 3355 "CollectionPage.c"
 			gboolean _tmp20_ = FALSE;
 			CheckerboardPageKeyboardModifiers _tmp21_ = {0};
 			gboolean _tmp22_ = FALSE;
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = *modifiers;
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _tmp21_.shift_pressed;
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp22_) {
-#line 3352 "CollectionPage.c"
+#line 3365 "CollectionPage.c"
 				CheckerboardPageKeyboardModifiers _tmp23_ = {0};
 				gboolean _tmp24_ = FALSE;
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = *modifiers;
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp24_ = _tmp23_.ctrl_pressed;
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = !_tmp24_;
-#line 3361 "CollectionPage.c"
+#line 3374 "CollectionPage.c"
 			} else {
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = FALSE;
-#line 3365 "CollectionPage.c"
+#line 3378 "CollectionPage.c"
 			}
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp20_) {
-#line 3369 "CollectionPage.c"
+#line 3382 "CollectionPage.c"
 				LibraryWindow* _tmp25_ = NULL;
 				LibraryWindow* _tmp26_ = NULL;
 				LibraryPhoto* _tmp27_ = NULL;
-#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp25_ = library_window_get_app ();
-#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp26_ = _tmp25_;
-#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp27_ = photo;
-#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				library_window_switch_to_photo_page (_tmp26_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PHOTO, Photo));
-#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp26_);
-#line 3383 "CollectionPage.c"
+#line 3396 "CollectionPage.c"
 			}
 		}
 	}
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (thumbnail);
-#line 3391 "CollectionPage.c"
+#line 3404 "CollectionPage.c"
 }
 
 
@@ -3400,133 +3413,133 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label4 = 0;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label5 = 0;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label6 = 0;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label7 = 0;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label8 = 0;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label9 = 0;
-#line 3424 "CollectionPage.c"
+#line 3437 "CollectionPage.c"
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	handled = TRUE;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = event;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((((((((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Page_Up")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("KP_Page_Up"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("Page_Down"))))) || (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("KP_Page_Down"))))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("Home"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Home"))))) || (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("End"))))) || (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_End"))))) {
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3447 "CollectionPage.c"
+#line 3460 "CollectionPage.c"
 			default:
 			{
 				GdkEventKey* _tmp6_ = NULL;
 				gboolean _tmp7_ = FALSE;
-#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp6_ = event;
-#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp6_, &_tmp7_);
-#line 364 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3458 "CollectionPage.c"
+#line 3471 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("bracketright")))) {
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3464 "CollectionPage.c"
+#line 3477 "CollectionPage.c"
 			default:
 			{
-#line 367 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 368 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 366 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3471 "CollectionPage.c"
+#line 3484 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("bracketleft")))) {
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3477 "CollectionPage.c"
+#line 3490 "CollectionPage.c"
 			default:
 			{
-#line 371 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
-#line 372 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3484 "CollectionPage.c"
+#line 3497 "CollectionPage.c"
 			}
 		}
 	} else {
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3490 "CollectionPage.c"
+#line 3503 "CollectionPage.c"
 			default:
 			{
-#line 375 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				handled = FALSE;
-#line 376 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3497 "CollectionPage.c"
+#line 3510 "CollectionPage.c"
 			}
 		}
 	}
-#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = handled;
-#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_) {
-#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = TRUE;
-#line 3507 "CollectionPage.c"
+#line 3520 "CollectionPage.c"
 	} else {
 		GdkEventKey* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = event;
-#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = PAGE_CLASS (collection_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp10_);
-#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _tmp11_;
-#line 3517 "CollectionPage.c"
+#line 3530 "CollectionPage.c"
 	}
-#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 3523 "CollectionPage.c"
+#line 3536 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_export_completed ((CollectionPage*) self);
-#line 3530 "CollectionPage.c"
+#line 3543 "CollectionPage.c"
 }
 
 
@@ -3582,233 +3595,233 @@ static void collection_page_real_on_export (MediaPage* base) {
 	ExporterUI* _tmp90_ = NULL;
 	ExporterUI* _tmp91_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 383 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = self->priv->exporter;
-#line 383 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp0_ != NULL) {
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3594 "CollectionPage.c"
+#line 3607 "CollectionPage.c"
 	}
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _tmp1_;
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_list = _tmp4_;
-#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = export_list;
-#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = gee_collection_get_size (_tmp5_);
-#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp7_ == 0) {
-#line 389 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 389 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3620 "CollectionPage.c"
+#line 3633 "CollectionPage.c"
 	}
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = collection_page_selection_has_photo (self);
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_some_photos = _tmp8_;
-#line 392 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = collection_page_selection_has_video (self);
-#line 392 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_some_videos = _tmp9_;
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = has_some_photos;
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp11_) {
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = TRUE;
-#line 3636 "CollectionPage.c"
+#line 3649 "CollectionPage.c"
 	} else {
 		gboolean _tmp12_ = FALSE;
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = has_some_videos;
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp12_;
-#line 3643 "CollectionPage.c"
+#line 3656 "CollectionPage.c"
 	}
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_assert (_tmp10_, "has_some_photos || has_some_videos");
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = has_some_photos;
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp13_) {
-#line 3651 "CollectionPage.c"
+#line 3664 "CollectionPage.c"
 		GeeCollection* _tmp14_ = NULL;
 		ExporterUI* _tmp15_ = NULL;
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = export_list;
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = video_export_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _collection_page_on_export_completed_exporter_completion_callback, self, FALSE);
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_exporter_ui_unref0 (self->priv->exporter);
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		self->priv->exporter = _tmp15_;
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3666 "CollectionPage.c"
+#line 3679 "CollectionPage.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	title = NULL;
-#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp16_ = has_some_videos;
-#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
-#line 3674 "CollectionPage.c"
+#line 3687 "CollectionPage.c"
 		const gchar* _tmp17_ = NULL;
 		GeeCollection* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
 		gchar* _tmp23_ = NULL;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = export_list;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = gee_collection_get_size (_tmp18_);
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = _tmp19_;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp20_ == 1) {
-#line 3688 "CollectionPage.c"
+#line 3701 "CollectionPage.c"
 			const gchar* _tmp21_ = NULL;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = _ ("Export Photo/Video");
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp21_;
-#line 3694 "CollectionPage.c"
+#line 3707 "CollectionPage.c"
 		} else {
 			const gchar* _tmp22_ = NULL;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _ ("Export Photos/Videos");
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp22_;
-#line 3701 "CollectionPage.c"
+#line 3714 "CollectionPage.c"
 		}
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = g_strdup (_tmp17_);
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		title = _tmp23_;
-#line 3709 "CollectionPage.c"
+#line 3722 "CollectionPage.c"
 	} else {
 		const gchar* _tmp24_ = NULL;
 		GeeCollection* _tmp25_ = NULL;
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
 		gchar* _tmp30_ = NULL;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = export_list;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp26_ = gee_collection_get_size (_tmp25_);
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp27_ = _tmp26_;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp27_ == 1) {
-#line 3724 "CollectionPage.c"
+#line 3737 "CollectionPage.c"
 			const gchar* _tmp28_ = NULL;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp28_ = _ ("Export Photo");
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = _tmp28_;
-#line 3730 "CollectionPage.c"
+#line 3743 "CollectionPage.c"
 		} else {
 			const gchar* _tmp29_ = NULL;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp29_ = _ ("Export Photos");
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = _tmp29_;
-#line 3737 "CollectionPage.c"
+#line 3750 "CollectionPage.c"
 		}
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp30_ = g_strdup (_tmp24_);
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		title = _tmp30_;
-#line 3745 "CollectionPage.c"
+#line 3758 "CollectionPage.c"
 	}
-#line 407 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = title;
-#line 407 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = export_dialog_new (_tmp31_);
-#line 407 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp32_);
-#line 407 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_dialog = _tmp32_;
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = has_some_videos;
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp34_) {
-#line 3759 "CollectionPage.c"
+#line 3772 "CollectionPage.c"
 		ExportFormatParameters _tmp35_ = {0};
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		export_format_parameters_current (&_tmp35_);
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp33_ = _tmp35_;
-#line 3765 "CollectionPage.c"
+#line 3778 "CollectionPage.c"
 	} else {
 		ExportFormatParameters _tmp36_ = {0};
-#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 416 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		export_format_parameters_last (&_tmp36_);
-#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 416 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp33_ = _tmp36_;
-#line 3772 "CollectionPage.c"
+#line 3785 "CollectionPage.c"
 	}
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_params = _tmp33_;
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp37_ = export_dialog;
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp40_ = export_dialog_execute (_tmp37_, &_tmp38_, &_tmp39_, &export_params);
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scale = _tmp38_;
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	constraint = _tmp39_;
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp40_) {
-#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 421 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 421 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 421 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 421 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3794 "CollectionPage.c"
+#line 3807 "CollectionPage.c"
 	}
-#line 425 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp41_ = constraint;
-#line 425 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp42_ = scale;
-#line 425 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scaling_for_constraint (_tmp41_, _tmp42_, FALSE, &_tmp43_);
-#line 425 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scaling = _tmp43_;
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 426 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp44_ = export_list;
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 426 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp45_ = gee_collection_get_size (_tmp44_);
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 426 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp46_ = _tmp45_;
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 426 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp46_ == 1) {
-#line 3812 "CollectionPage.c"
+#line 3825 "CollectionPage.c"
 		LibraryPhoto* photo = NULL;
 		GFile* save_as = NULL;
 		LibraryPhoto* _tmp55_ = NULL;
@@ -3818,22 +3831,22 @@ static void collection_page_real_on_export (MediaPage* base) {
 		GFile* _tmp59_ = NULL;
 		GFile* _tmp60_ = NULL;
 		GFile* _tmp61_ = NULL;
-#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo = NULL;
-#line 3824 "CollectionPage.c"
+#line 3837 "CollectionPage.c"
 		{
 			GeeIterator* _p_it = NULL;
 			GeeCollection* _tmp47_ = NULL;
 			GeeIterator* _tmp48_ = NULL;
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp47_ = export_list;
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp48_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable));
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_p_it = _tmp48_;
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 3837 "CollectionPage.c"
+#line 3850 "CollectionPage.c"
 				GeeIterator* _tmp49_ = NULL;
 				gboolean _tmp50_ = FALSE;
 				LibraryPhoto* p = NULL;
@@ -3841,73 +3854,73 @@ static void collection_page_real_on_export (MediaPage* base) {
 				gpointer _tmp52_ = NULL;
 				LibraryPhoto* _tmp53_ = NULL;
 				LibraryPhoto* _tmp54_ = NULL;
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp49_ = _p_it;
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp50_ = gee_iterator_next (_tmp49_);
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (!_tmp50_) {
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 3853 "CollectionPage.c"
+#line 3866 "CollectionPage.c"
 				}
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp51_ = _p_it;
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp52_ = gee_iterator_get (_tmp51_);
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				p = (LibraryPhoto*) _tmp52_;
-#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp53_ = p;
-#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp54_ = _g_object_ref0 (_tmp53_);
-#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				photo = _tmp54_;
-#line 432 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (p);
-#line 432 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3873 "CollectionPage.c"
+#line 3886 "CollectionPage.c"
 			}
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_p_it);
-#line 3877 "CollectionPage.c"
+#line 3890 "CollectionPage.c"
 		}
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp55_ = photo;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp56_ = export_params;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp57_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo), &_tmp56_);
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp58_ = _tmp57_;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp59_ = export_ui_choose_file (_tmp58_);
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp60_ = _tmp59_;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp58_);
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		save_as = _tmp60_;
-#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp61_ = save_as;
-#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp61_ == NULL) {
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (save_as);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_dialog);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_free0 (title);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_list);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 3911 "CollectionPage.c"
+#line 3924 "CollectionPage.c"
 		}
 		{
 			AppWindow* _tmp62_ = NULL;
@@ -3926,54 +3939,54 @@ static void collection_page_real_on_export (MediaPage* base) {
 			gboolean _tmp75_ = FALSE;
 			AppWindow* _tmp76_ = NULL;
 			AppWindow* _tmp77_ = NULL;
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp62_ = app_window_get_instance ();
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp63_ = _tmp62_;
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PAGE_WINDOW, PageWindow));
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp63_);
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp64_ = photo;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp65_ = save_as;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp66_ = scaling;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp67_ = export_params;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp68_ = _tmp67_.quality;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp69_ = photo;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp70_ = export_params;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp71_ = photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_PHOTO, Photo), &_tmp70_);
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp72_ = export_params;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp73_ = _tmp72_.mode;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp74_ = export_params;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp75_ = _tmp74_.export_metadata;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PHOTO, Photo), _tmp65_, &_tmp66_, _tmp68_, _tmp71_, _tmp73_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp75_, &_inner_error_);
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3966 "CollectionPage.c"
+#line 3979 "CollectionPage.c"
 				goto __catch230_g_error;
 			}
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp76_ = app_window_get_instance ();
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp77_ = _tmp76_;
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_PAGE_WINDOW, PageWindow));
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp77_);
-#line 3977 "CollectionPage.c"
+#line 3990 "CollectionPage.c"
 		}
 		goto __finally230;
 		__catch230_g_error:
@@ -3982,135 +3995,135 @@ static void collection_page_real_on_export (MediaPage* base) {
 			AppWindow* _tmp78_ = NULL;
 			AppWindow* _tmp79_ = NULL;
 			GFile* _tmp80_ = NULL;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			err = _inner_error_;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_inner_error_ = NULL;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp78_ = app_window_get_instance ();
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp79_ = _tmp78_;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_PAGE_WINDOW, PageWindow));
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp79_);
-#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp80_ = save_as;
-#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			export_error_dialog (_tmp80_, FALSE);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_error_free0 (err);
-#line 4004 "CollectionPage.c"
+#line 4017 "CollectionPage.c"
 		}
 		__finally230:
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (save_as);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_dialog);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_free0 (title);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_list);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			g_critical ("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 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			g_clear_error (&_inner_error_);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4025 "CollectionPage.c"
+#line 4038 "CollectionPage.c"
 		}
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (save_as);
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4039 "CollectionPage.c"
+#line 4052 "CollectionPage.c"
 	}
-#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp81_ = title;
-#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp82_ = export_ui_choose_dir (_tmp81_);
-#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_dir = _tmp82_;
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 454 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp83_ = export_dir;
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 454 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp83_ == NULL) {
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dir);
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4061 "CollectionPage.c"
+#line 4074 "CollectionPage.c"
 	}
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp84_ = export_list;
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp85_ = export_dir;
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp86_ = scaling;
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp87_ = export_params;
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp88_ = exporter_new (_tmp84_, _tmp85_, &_tmp86_, &_tmp87_, FALSE);
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp89_ = _tmp88_;
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp90_ = exporter_ui_new (_tmp89_);
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->exporter = _tmp90_;
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp89_);
-#line 460 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp91_ = self->priv->exporter;
-#line 460 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	exporter_ui_export (_tmp91_, _collection_page_on_export_completed_exporter_completion_callback, self);
-#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_dir);
-#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_free0 (title);
-#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_list);
-#line 4095 "CollectionPage.c"
+#line 4108 "CollectionPage.c"
 }
 
 
 static void collection_page_on_export_completed (CollectionPage* self) {
-#line 463 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->exporter = NULL;
-#line 4106 "CollectionPage.c"
+#line 4119 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 	gboolean result = FALSE;
-#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4114 "CollectionPage.c"
+#line 4127 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -4122,31 +4135,31 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _source_index = 0;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp0_;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_list = _tmp3_;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _source_list;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_size = _tmp6_;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_index = -1;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 4150 "CollectionPage.c"
+#line 4163 "CollectionPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -4159,107 +4172,107 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 			LibraryPhoto* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
 			LibraryPhoto* _tmp16_ = NULL;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_source_index = _tmp7_ + 1;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _source_index;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = _source_size;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4175 "CollectionPage.c"
+#line 4188 "CollectionPage.c"
 			}
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _source_index;
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			source = (DataSource*) _tmp12_;
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = source;
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp13_) : NULL);
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp14_;
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photo;
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 4195 "CollectionPage.c"
+#line 4208 "CollectionPage.c"
 				gboolean _tmp17_ = FALSE;
 				LibraryPhoto* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo;
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp19_ = photo_has_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo));
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (_tmp19_) {
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = TRUE;
-#line 4207 "CollectionPage.c"
+#line 4220 "CollectionPage.c"
 				} else {
 					LibraryPhoto* _tmp20_ = NULL;
 					gboolean _tmp21_ = FALSE;
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp20_ = photo;
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp21_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = _tmp21_;
-#line 4217 "CollectionPage.c"
+#line 4230 "CollectionPage.c"
 				}
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp17_;
-#line 4221 "CollectionPage.c"
+#line 4234 "CollectionPage.c"
 			} else {
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 4225 "CollectionPage.c"
+#line 4238 "CollectionPage.c"
 			}
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
-#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				result = TRUE;
-#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (source);
-#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_source_list);
-#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 4239 "CollectionPage.c"
+#line 4252 "CollectionPage.c"
 			}
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 4245 "CollectionPage.c"
+#line 4258 "CollectionPage.c"
 		}
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 4249 "CollectionPage.c"
+#line 4262 "CollectionPage.c"
 	}
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 472 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 472 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 4255 "CollectionPage.c"
+#line 4268 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_can_revert_editable_selected (CollectionPage* self) {
 	gboolean result = FALSE;
-#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4263 "CollectionPage.c"
+#line 4276 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -4271,31 +4284,31 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _source_index = 0;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp0_;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_list = _tmp3_;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _source_list;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_size = _tmp6_;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_index = -1;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 4299 "CollectionPage.c"
+#line 4312 "CollectionPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -4308,82 +4321,82 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 			LibraryPhoto* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
 			LibraryPhoto* _tmp16_ = NULL;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_source_index = _tmp7_ + 1;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _source_index;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = _source_size;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4324 "CollectionPage.c"
+#line 4337 "CollectionPage.c"
 			}
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _source_index;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			source = (DataSource*) _tmp12_;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = source;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp13_) : NULL);
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp14_;
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photo;
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 4344 "CollectionPage.c"
+#line 4357 "CollectionPage.c"
 				LibraryPhoto* _tmp17_ = NULL;
 				gboolean _tmp18_ = FALSE;
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp17_ = photo;
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo));
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp18_;
-#line 4353 "CollectionPage.c"
+#line 4366 "CollectionPage.c"
 			} else {
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 4357 "CollectionPage.c"
+#line 4370 "CollectionPage.c"
 			}
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				result = TRUE;
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (source);
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_source_list);
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 4371 "CollectionPage.c"
+#line 4384 "CollectionPage.c"
 			}
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 4377 "CollectionPage.c"
+#line 4390 "CollectionPage.c"
 		}
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 4381 "CollectionPage.c"
+#line 4394 "CollectionPage.c"
 	}
-#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
-#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 4387 "CollectionPage.c"
+#line 4400 "CollectionPage.c"
 }
 
 
@@ -4404,59 +4417,59 @@ static void collection_page_on_rotate_clockwise (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4424 "CollectionPage.c"
+#line 4437 "CollectionPage.c"
 	}
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Rotating");
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Rotate");
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP, _tmp8_, _tmp9_);
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4460 "CollectionPage.c"
+#line 4473 "CollectionPage.c"
 }
 
 
@@ -4465,40 +4478,40 @@ static void collection_page_on_publish (CollectionPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 4483 "CollectionPage.c"
+#line 4496 "CollectionPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
 		GeeCollection* _tmp7_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		publishing_ui_publishing_dialog_go (_tmp7_);
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4502 "CollectionPage.c"
+#line 4515 "CollectionPage.c"
 	}
 }
 
@@ -4520,59 +4533,59 @@ static void collection_page_on_rotate_counterclockwise (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4540 "CollectionPage.c"
+#line 4553 "CollectionPage.c"
 	}
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Rotating");
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Rotate");
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP, _tmp8_, _tmp9_);
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 501 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4576 "CollectionPage.c"
+#line 4589 "CollectionPage.c"
 }
 
 
@@ -4593,59 +4606,59 @@ static void collection_page_on_flip_horizontally (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4613 "CollectionPage.c"
+#line 4626 "CollectionPage.c"
 	}
-#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Flipping Horizontally");
-#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Flip Horizontally");
-#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "", _tmp8_, _tmp9_);
-#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4649 "CollectionPage.c"
+#line 4662 "CollectionPage.c"
 }
 
 
@@ -4666,59 +4679,59 @@ static void collection_page_on_flip_vertically (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4686 "CollectionPage.c"
+#line 4699 "CollectionPage.c"
 	}
-#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Flipping Vertically");
-#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Flip Vertically");
-#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "", _tmp8_, _tmp9_);
-#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4722 "CollectionPage.c"
+#line 4735 "CollectionPage.c"
 }
 
 
@@ -4738,29 +4751,29 @@ static void collection_page_on_revert (CollectionPage* self) {
 	CommandManager* _tmp33_ = NULL;
 	CommandManager* _tmp34_ = NULL;
 	RevertMultipleCommand* _tmp35_ = NULL;
-#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4758 "CollectionPage.c"
+#line 4771 "CollectionPage.c"
 	}
-#line 537 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = collection_page_can_revert_editable_selected (self);
-#line 537 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp4_) {
-#line 4764 "CollectionPage.c"
+#line 4777 "CollectionPage.c"
 		AppWindow* _tmp5_ = NULL;
 		AppWindow* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
@@ -4769,33 +4782,33 @@ static void collection_page_on_revert (CollectionPage* self) {
 		GeeCollection* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		gboolean _tmp12_ = FALSE;
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _tmp7_;
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = view_collection_get_selected_sources (_tmp8_);
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp10_);
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = !_tmp11_;
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp12_) {
-#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4799 "CollectionPage.c"
+#line 4812 "CollectionPage.c"
 		}
 		{
 			GeeList* _object_list = NULL;
@@ -4808,31 +4821,31 @@ static void collection_page_on_revert (CollectionPage* self) {
 			gint _tmp18_ = 0;
 			gint _tmp19_ = 0;
 			gint _object_index = 0;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _tmp13_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = view_collection_get_selected_sources (_tmp14_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = _tmp15_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_data_collection_unref0 (_tmp14_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_list = _tmp16_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _object_list;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = _tmp18_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_size = _tmp19_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_index = -1;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 4836 "CollectionPage.c"
+#line 4849 "CollectionPage.c"
 				gint _tmp20_ = 0;
 				gint _tmp21_ = 0;
 				gint _tmp22_ = 0;
@@ -4841,72 +4854,72 @@ static void collection_page_on_revert (CollectionPage* self) {
 				gint _tmp24_ = 0;
 				gpointer _tmp25_ = NULL;
 				DataObject* _tmp26_ = NULL;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = _object_index;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_object_index = _tmp20_ + 1;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp21_ = _object_index;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp22_ = _object_size;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (!(_tmp21_ < _tmp22_)) {
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 4857 "CollectionPage.c"
+#line 4870 "CollectionPage.c"
 				}
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = _object_list;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp24_ = _object_index;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp25_ = gee_list_get (_tmp23_, _tmp24_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				object = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp25_, TYPE_DATA_OBJECT, DataObject);
-#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 542 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp26_ = object;
-#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 542 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo), TRUE);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 4873 "CollectionPage.c"
+#line 4886 "CollectionPage.c"
 			}
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_object_list);
-#line 4877 "CollectionPage.c"
+#line 4890 "CollectionPage.c"
 		}
 	}
-#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = _tmp27_;
-#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = view_collection_get_selected (_tmp28_);
-#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = _tmp29_;
-#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = revert_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = _tmp31_;
-#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp30_);
-#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp28_);
-#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp32_;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = command;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_COMMAND, Command));
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp34_);
-#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4910 "CollectionPage.c"
+#line 4923 "CollectionPage.c"
 }
 
 
@@ -4925,57 +4938,57 @@ void collection_page_on_copy_adjustments (CollectionPage* self) {
 	Photo* _tmp10_ = NULL;
 	PixelTransformationBundle* _tmp11_ = NULL;
 	PixelTransformationBundle* _tmp12_ = NULL;
-#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4945 "CollectionPage.c"
+#line 4958 "CollectionPage.c"
 	}
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = photo_get_color_adjustments (_tmp10_);
-#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = _tmp11_;
-#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	pixel_transformation_bundle_set_copied_color_adjustments (_tmp12_);
-#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_pixel_transformation_bundle_unref0 (_tmp12_);
-#line 556 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
-#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 4979 "CollectionPage.c"
+#line 4992 "CollectionPage.c"
 }
 
 
@@ -4998,78 +5011,78 @@ void collection_page_on_paste_adjustments (CollectionPage* self) {
 	CommandManager* _tmp14_ = NULL;
 	CommandManager* _tmp15_ = NULL;
 	AdjustColorsMultipleCommand* _tmp16_ = NULL;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = pixel_transformation_bundle_get_copied_color_adjustments ();
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	copied_adjustments = _tmp0_;
-#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_ == 0;
-#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_) {
-#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = TRUE;
-#line 5022 "CollectionPage.c"
+#line 5035 "CollectionPage.c"
 	} else {
 		PixelTransformationBundle* _tmp6_ = NULL;
-#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = copied_adjustments;
-#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp6_ == NULL;
-#line 5029 "CollectionPage.c"
+#line 5042 "CollectionPage.c"
 	}
-#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp1_) {
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5037 "CollectionPage.c"
+#line 5050 "CollectionPage.c"
 	}
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_;
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = view_collection_get_selected (_tmp8_);
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = _tmp9_;
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = copied_adjustments;
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = adjust_colors_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable), _tmp11_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP);
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp13_;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp15_ = _tmp14_;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp16_ = command;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp15_);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 5073 "CollectionPage.c"
+#line 5086 "CollectionPage.c"
 }
 
 
@@ -5088,55 +5101,55 @@ static void collection_page_on_enhance (CollectionPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	EnhanceMultipleCommand* _tmp12_ = NULL;
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5108 "CollectionPage.c"
+#line 5121 "CollectionPage.c"
 	}
-#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = enhance_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5140 "CollectionPage.c"
+#line 5153 "CollectionPage.c"
 }
 
 
@@ -5155,55 +5168,55 @@ static void collection_page_on_duplicate_photo (CollectionPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	DuplicateMultiplePhotosCommand* _tmp12_ = NULL;
-#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5175 "CollectionPage.c"
+#line 5188 "CollectionPage.c"
 	}
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = duplicate_multiple_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5207 "CollectionPage.c"
+#line 5220 "CollectionPage.c"
 }
 
 
@@ -5238,29 +5251,29 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 	gboolean _tmp37_ = FALSE;
 	gboolean _tmp38_ = FALSE;
 	gboolean _tmp39_ = FALSE;
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5258 "CollectionPage.c"
+#line 5271 "CollectionPage.c"
 	}
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selected_has_videos = FALSE;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	only_videos_selected = TRUE;
-#line 5264 "CollectionPage.c"
+#line 5277 "CollectionPage.c"
 	{
 		GeeList* _dv_list = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -5272,31 +5285,31 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 		gint _dv_index = 0;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_list = _tmp7_;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _dv_list;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp9_;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_size = _tmp10_;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_index = -1;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 5300 "CollectionPage.c"
+#line 5313 "CollectionPage.c"
 			gint _tmp11_ = 0;
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
@@ -5308,109 +5321,109 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 			DataSource* _tmp18_ = NULL;
 			DataSource* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _dv_index;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_dv_index = _tmp11_ + 1;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = _dv_index;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = _dv_size;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp12_ < _tmp13_)) {
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 5324 "CollectionPage.c"
+#line 5337 "CollectionPage.c"
 			}
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _dv_list;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = _dv_index;
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = gee_list_get (_tmp14_, _tmp15_);
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			dv = (DataView*) _tmp16_;
-#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = dv;
-#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = data_view_get_source (_tmp17_);
-#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = _tmp18_;
-#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO);
-#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp19_);
-#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp20_) {
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				selected_has_videos = TRUE;
-#line 5348 "CollectionPage.c"
+#line 5361 "CollectionPage.c"
 			} else {
-#line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				only_videos_selected = FALSE;
-#line 5352 "CollectionPage.c"
+#line 5365 "CollectionPage.c"
 			}
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (dv);
-#line 5356 "CollectionPage.c"
+#line 5369 "CollectionPage.c"
 		}
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_dv_list);
-#line 5360 "CollectionPage.c"
+#line 5373 "CollectionPage.c"
 	}
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = _tmp21_;
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp23_ = view_collection_get_selected_at (_tmp22_, 0);
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = _tmp23_;
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp25_ = data_view_get_source (_tmp24_);
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp26_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATEABLE, Dateable);
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp24_);
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo_source = _tmp26_;
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = photo_source;
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = _tmp28_;
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = view_collection_get_selected_count (_tmp29_);
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = selected_has_videos;
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = only_videos_selected;
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = adjust_date_time_dialog_new (_tmp27_, _tmp30_, TRUE, _tmp31_, _tmp32_);
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp33_);
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp29_);
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	dialog = _tmp34_;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = dialog;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp39_ = adjust_date_time_dialog_execute (_tmp35_, &_tmp36_, &_tmp37_, &_tmp38_);
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	time_shift = _tmp36_;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	keep_relativity = _tmp37_;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	modify_originals = _tmp38_;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp39_) {
-#line 5414 "CollectionPage.c"
+#line 5427 "CollectionPage.c"
 		AdjustDateTimePhotosCommand* command = NULL;
 		ViewCollection* _tmp40_ = NULL;
 		ViewCollection* _tmp41_ = NULL;
@@ -5424,49 +5437,49 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		CommandManager* _tmp49_ = NULL;
 		CommandManager* _tmp50_ = NULL;
 		AdjustDateTimePhotosCommand* _tmp51_ = NULL;
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp41_ = _tmp40_;
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp42_ = view_collection_get_selected (_tmp41_);
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp43_ = _tmp42_;
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp44_ = time_shift;
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp45_ = keep_relativity;
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp46_ = modify_originals;
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp47_ = adjust_date_time_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ITERABLE, GeeIterable), _tmp44_, _tmp45_, _tmp46_);
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp48_ = _tmp47_;
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp43_);
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp41_);
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		command = _tmp48_;
-#line 610 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp49_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 610 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = _tmp49_;
-#line 610 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp51_ = command;
-#line 610 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		command_manager_execute (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command));
-#line 610 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_command_manager_unref0 (_tmp50_);
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (command);
-#line 5464 "CollectionPage.c"
+#line 5477 "CollectionPage.c"
 	}
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (dialog);
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo_source);
-#line 5470 "CollectionPage.c"
+#line 5483 "CollectionPage.c"
 }
 
 
@@ -5483,75 +5496,75 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 	DataSource* _tmp8_ = NULL;
 	Photo* _tmp9_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5503 "CollectionPage.c"
+#line 5516 "CollectionPage.c"
 	}
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 5523 "CollectionPage.c"
+#line 5536 "CollectionPage.c"
 	{
 		AppWindow* _tmp10_ = NULL;
 		AppWindow* _tmp11_ = NULL;
 		Photo* _tmp12_ = NULL;
 		AppWindow* _tmp13_ = NULL;
 		AppWindow* _tmp14_ = NULL;
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = app_window_get_instance ();
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = _tmp10_;
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow));
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = photo;
-#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo_open_with_external_editor (_tmp12_, &_inner_error_);
-#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5544 "CollectionPage.c"
+#line 5557 "CollectionPage.c"
 			goto __catch231_g_error;
 		}
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = app_window_get_instance ();
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = _tmp13_;
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow));
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 5555 "CollectionPage.c"
+#line 5568 "CollectionPage.c"
 	}
 	goto __finally231;
 	__catch231_g_error:
@@ -5561,44 +5574,44 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 		AppWindow* _tmp16_ = NULL;
 		GError* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_inner_error_ = NULL;
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp15_;
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp17_ = err;
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = photo;
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		open_external_editor_error_dialog (_tmp17_, _tmp18_);
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 5585 "CollectionPage.c"
+#line 5598 "CollectionPage.c"
 	}
 	__finally231:
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_critical ("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 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_clear_error (&_inner_error_);
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5598 "CollectionPage.c"
+#line 5611 "CollectionPage.c"
 	}
-#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5602 "CollectionPage.c"
+#line 5615 "CollectionPage.c"
 }
 
 
@@ -5617,53 +5630,53 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 	Photo* _tmp10_ = NULL;
 	PhotoFileFormat _tmp11_ = 0;
 	GError * _inner_error_ = NULL;
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5637 "CollectionPage.c"
+#line 5650 "CollectionPage.c"
 	}
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 634 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 634 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = photo_get_master_file_format (_tmp10_);
-#line 634 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp11_ != PHOTO_FILE_FORMAT_RAW) {
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5667 "CollectionPage.c"
+#line 5680 "CollectionPage.c"
 	}
 	{
 		AppWindow* _tmp12_ = NULL;
@@ -5671,32 +5684,32 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		Photo* _tmp14_ = NULL;
 		AppWindow* _tmp15_ = NULL;
 		AppWindow* _tmp16_ = NULL;
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = app_window_get_instance ();
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = photo;
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo_open_with_raw_external_editor (_tmp14_, &_inner_error_);
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5689 "CollectionPage.c"
+#line 5702 "CollectionPage.c"
 			goto __catch232_g_error;
 		}
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp15_;
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 5700 "CollectionPage.c"
+#line 5713 "CollectionPage.c"
 	}
 	goto __finally232;
 	__catch232_g_error:
@@ -5707,48 +5720,48 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		GError* _tmp19_ = NULL;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
-#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_inner_error_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp17_ = app_window_get_instance ();
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = _tmp17_;
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PAGE_WINDOW, PageWindow));
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = err;
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = resources_launch_editor_failed (_tmp19_);
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp21_ = _tmp20_;
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		app_window_error_message (_tmp21_, NULL);
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp21_);
-#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 5735 "CollectionPage.c"
+#line 5748 "CollectionPage.c"
 	}
 	__finally232:
-#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_critical ("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 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_clear_error (&_inner_error_);
-#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5748 "CollectionPage.c"
+#line 5761 "CollectionPage.c"
 	}
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5752 "CollectionPage.c"
+#line 5765 "CollectionPage.c"
 }
 
 
@@ -5765,58 +5778,60 @@ void collection_page_on_set_background (CollectionPage* self) {
 	GeeArrayList* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 646 "/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);
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photos = _tmp0_;
-#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _tmp1_;
-#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = photos;
-#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	media_source_collection_filter_media (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), NULL);
-#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = photos;
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_;
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_ == 1) {
-#line 5799 "CollectionPage.c"
+#line 5812 "CollectionPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
 		SetBackgroundPhotoDialog* _tmp9_ = NULL;
 		SetBackgroundPhotoDialog* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		gboolean _tmp12_ = FALSE;
 		gboolean _tmp13_ = FALSE;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = set_background_photo_dialog_new ();
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		g_object_ref_sink (_tmp9_);
+#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		dialog = _tmp9_;
-#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = dialog;
-#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = set_background_photo_dialog_execute (_tmp10_, &_tmp11_, &_tmp12_);
-#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		desktop = _tmp11_;
-#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		screensaver = _tmp12_;
-#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp13_) {
-#line 5820 "CollectionPage.c"
+#line 5835 "CollectionPage.c"
 			AppWindow* _tmp14_ = NULL;
 			AppWindow* _tmp15_ = NULL;
 			GeeArrayList* _tmp16_ = NULL;
@@ -5826,54 +5841,54 @@ void collection_page_on_set_background (CollectionPage* self) {
 			gboolean _tmp20_ = FALSE;
 			AppWindow* _tmp21_ = NULL;
 			AppWindow* _tmp22_ = NULL;
-#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = app_window_get_instance ();
-#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = _tmp14_;
-#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow));
-#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photos;
-#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = (LibraryPhoto*) _tmp17_;
-#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = desktop;
-#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = screensaver;
-#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			desktop_integration_set_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo), _tmp19_, _tmp20_);
-#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp18_);
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = app_window_get_instance ();
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _tmp21_;
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE_WINDOW, PageWindow));
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp22_);
-#line 5860 "CollectionPage.c"
+#line 5875 "CollectionPage.c"
 		}
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_set_background_dialog_unref0 (dialog);
-#line 5864 "CollectionPage.c"
+#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (dialog);
+#line 5879 "CollectionPage.c"
 	} else {
 		GeeArrayList* _tmp23_ = NULL;
 		gint _tmp24_ = 0;
 		gint _tmp25_ = 0;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = photos;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = _tmp24_;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp25_ > 1) {
-#line 5877 "CollectionPage.c"
+#line 5892 "CollectionPage.c"
 			SetBackgroundSlideshowDialog* dialog = NULL;
 			SetBackgroundSlideshowDialog* _tmp26_ = NULL;
 			gint delay = 0;
@@ -5882,23 +5897,25 @@ void collection_page_on_set_background (CollectionPage* self) {
 			gboolean _tmp29_ = FALSE;
 			gboolean _tmp30_ = FALSE;
 			gboolean _tmp31_ = FALSE;
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp26_ = set_background_slideshow_dialog_new ();
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			g_object_ref_sink (_tmp26_);
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			dialog = _tmp26_;
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp27_ = dialog;
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp31_ = set_background_slideshow_dialog_execute (_tmp27_, &_tmp28_, &_tmp29_, &_tmp30_);
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			delay = _tmp28_;
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			desktop = _tmp29_;
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			screensaver = _tmp30_;
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp31_) {
-#line 5902 "CollectionPage.c"
+#line 5919 "CollectionPage.c"
 				AppWindow* _tmp32_ = NULL;
 				AppWindow* _tmp33_ = NULL;
 				GeeArrayList* _tmp34_ = NULL;
@@ -5907,42 +5924,42 @@ void collection_page_on_set_background (CollectionPage* self) {
 				gboolean _tmp37_ = FALSE;
 				AppWindow* _tmp38_ = NULL;
 				AppWindow* _tmp39_ = NULL;
-#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp32_ = app_window_get_instance ();
-#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp33_ = _tmp32_;
-#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PAGE_WINDOW, PageWindow));
-#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp33_);
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp34_ = photos;
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp35_ = delay;
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp36_ = desktop;
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp37_ = screensaver;
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				desktop_integration_set_background_slideshow (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), (gdouble) _tmp35_, COLLECTION_PAGE_DESKTOP_SLIDESHOW_TRANSITION_SEC, _tmp36_, _tmp37_);
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp38_ = app_window_get_instance ();
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp39_ = _tmp38_;
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PAGE_WINDOW, PageWindow));
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp39_);
-#line 5937 "CollectionPage.c"
+#line 5954 "CollectionPage.c"
 			}
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_set_background_dialog_unref0 (dialog);
-#line 5941 "CollectionPage.c"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_g_object_unref0 (dialog);
+#line 5958 "CollectionPage.c"
 		}
 	}
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photos);
-#line 5946 "CollectionPage.c"
+#line 5963 "CollectionPage.c"
 }
 
 
@@ -5982,205 +5999,205 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 	LibraryPhoto* _tmp38_ = NULL;
 	SlideshowPage* _tmp39_ = NULL;
 	SlideshowPage* _tmp40_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6002 "CollectionPage.c"
+#line 6019 "CollectionPage.c"
 	}
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = _tmp5_;
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = view_collection_get_selected_count (_tmp6_);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_ > 0;
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_) {
-#line 6016 "CollectionPage.c"
+#line 6033 "CollectionPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
 		GeeList* _tmp11_ = NULL;
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp9_;
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = view_collection_get_selected_sources_of_type (_tmp10_, TYPE_LIBRARY_PHOTO);
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _tmp11_;
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 6032 "CollectionPage.c"
+#line 6049 "CollectionPage.c"
 	} else {
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		GeeList* _tmp14_ = NULL;
-#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = view_collection_get_sources_of_type (_tmp13_, TYPE_LIBRARY_PHOTO);
-#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _tmp14_;
-#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 6049 "CollectionPage.c"
+#line 6066 "CollectionPage.c"
 	}
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp15_ = _g_object_ref0 (_tmp4_);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	sources = _tmp15_;
-#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp17_ = sources;
-#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp17_ == NULL) {
-#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = TRUE;
-#line 6061 "CollectionPage.c"
+#line 6078 "CollectionPage.c"
 	} else {
 		GeeList* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
-#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = sources;
-#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = _tmp19_;
-#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp20_ == 0;
-#line 6074 "CollectionPage.c"
+#line 6091 "CollectionPage.c"
 	}
-#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6084 "CollectionPage.c"
+#line 6101 "CollectionPage.c"
 	}
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = _tmp21_;
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp23_ = sources;
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = gee_list_get (_tmp23_, 0);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp25_ = (DataSource*) _tmp24_;
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp26_ = view_collection_get_view_for_source (_tmp22_, _tmp25_);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_THUMBNAIL, Thumbnail);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp25_);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	thumbnail = _tmp27_;
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = thumbnail;
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp28_ == NULL) {
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6118 "CollectionPage.c"
+#line 6135 "CollectionPage.c"
 	}
-#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = thumbnail;
-#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = thumbnail_get_media_source (_tmp29_);
-#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp30_) : NULL;
-#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp31_ == NULL) {
-#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp30_);
-#line 6130 "CollectionPage.c"
+#line 6147 "CollectionPage.c"
 	}
-#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp31_;
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = photo;
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp32_ == NULL) {
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6148 "CollectionPage.c"
+#line 6165 "CollectionPage.c"
 	}
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = app_window_get_instance ();
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = library_photo_global;
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp37_ = _tmp36_;
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp38_ = photo;
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp39_ = slideshow_page_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO, Photo));
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp39_);
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp40_ = _tmp39_;
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	app_window_go_fullscreen (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PAGE, Page));
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp40_);
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp37_);
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp34_);
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (thumbnail);
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (sources);
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6184 "CollectionPage.c"
+#line 6201 "CollectionPage.c"
 }
 
 
@@ -6194,49 +6211,49 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e
 	GtkToolButton* _tmp3_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "ToolRotate");
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_tool_button_get_type ()) ? ((GtkToolButton*) _tmp1_) : NULL);
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	rotate_button = _tmp2_;
-#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = rotate_button;
-#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6212 "CollectionPage.c"
+#line 6229 "CollectionPage.c"
 		GtkToolButton* _tmp4_ = NULL;
 		GtkToolButton* _tmp5_ = NULL;
 		GtkToolButton* _tmp6_ = NULL;
-#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
-#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.RotateCounterclockwise");
-#line 699 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = rotate_button;
-#line 699 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_button_set_icon_name (_tmp5_, "object-rotate-left");
-#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = rotate_button;
-#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 6228 "CollectionPage.c"
+#line 6245 "CollectionPage.c"
 	}
-#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
-#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = PAGE_CLASS (collection_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp7_);
-#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (rotate_button);
-#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6240 "CollectionPage.c"
+#line 6257 "CollectionPage.c"
 }
 
 
@@ -6250,56 +6267,56 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey*
 	GtkToolButton* _tmp3_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "ToolRotate");
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_tool_button_get_type ()) ? ((GtkToolButton*) _tmp1_) : NULL);
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	rotate_button = _tmp2_;
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = rotate_button;
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6268 "CollectionPage.c"
+#line 6285 "CollectionPage.c"
 		GtkToolButton* _tmp4_ = NULL;
 		GtkToolButton* _tmp5_ = NULL;
 		GtkToolButton* _tmp6_ = NULL;
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.RotateClockwise");
-#line 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = rotate_button;
-#line 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_button_set_icon_name (_tmp5_, "object-rotate-right");
-#line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = rotate_button;
-#line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP);
-#line 6284 "CollectionPage.c"
+#line 6301 "CollectionPage.c"
 	}
-#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
-#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = PAGE_CLASS (collection_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp7_);
-#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (rotate_button);
-#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6296 "CollectionPage.c"
+#line 6313 "CollectionPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 6303 "CollectionPage.c"
+#line 6320 "CollectionPage.c"
 }
 
 
@@ -6308,17 +6325,17 @@ static SearchViewFilter* collection_page_real_get_search_view_filter (Checkerboa
 	SearchViewFilter* result = NULL;
 	CollectionPageCollectionSearchViewFilter* _tmp0_ = NULL;
 	SearchViewFilter* _tmp1_ = NULL;
-#line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp1_;
-#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6322 "CollectionPage.c"
+#line 6339 "CollectionPage.c"
 }
 
 
@@ -6331,7 +6348,7 @@ static guint collection_page_collection_search_view_filter_real_get_criteria (Se
 	result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 24 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6335 "CollectionPage.c"
+#line 6352 "CollectionPage.c"
 }
 
 
@@ -6341,14 +6358,14 @@ CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view
 	self = (CollectionPageCollectionSearchViewFilter*) default_search_view_filter_construct (object_type);
 #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self;
-#line 6345 "CollectionPage.c"
+#line 6362 "CollectionPage.c"
 }
 
 
 CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void) {
 #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return collection_page_collection_search_view_filter_construct (COLLECTION_PAGE_TYPE_COLLECTION_SEARCH_VIEW_FILTER);
-#line 6352 "CollectionPage.c"
+#line 6369 "CollectionPage.c"
 }
 
 
@@ -6357,7 +6374,7 @@ static void collection_page_collection_search_view_filter_class_init (Collection
 	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;
-#line 6361 "CollectionPage.c"
+#line 6378 "CollectionPage.c"
 }
 
 
@@ -6408,7 +6425,7 @@ static void collection_page_class_init (CollectionPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = 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 6412 "CollectionPage.c"
+#line 6429 "CollectionPage.c"
 }
 
 
@@ -6422,7 +6439,7 @@ static void collection_page_instance_init (CollectionPage * self) {
 	_tmp0_ = collection_page_collection_search_view_filter_new ();
 #line 30 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 6426 "CollectionPage.c"
+#line 6443 "CollectionPage.c"
 }
 
 
@@ -6436,7 +6453,7 @@ static void collection_page_finalize (GObject* obj) {
 	_view_filter_unref0 (self->priv->search_filter);
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	G_OBJECT_CLASS (collection_page_parent_class)->finalize (obj);
-#line 6440 "CollectionPage.c"
+#line 6457 "CollectionPage.c"
 }
 
 
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index ba9e1ac..c43c0c8 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -75,7 +75,7 @@ public abstract class CollectionPage : MediaPage {
         group.add_separator();
         group.add_menu_item(_("_Publish"), "Publish", "<Primary><Shift>p");
         group.add_menu_item(_("Send _To…"), "SendTo");
-        group.add_menu_item(_("Set as _Desktop Background"), "SetBackground");
+        group.add_menu_item(_("Set as _Desktop Background"), "SetBackground", "<Primary>b");
         
         return group;
     }
@@ -269,12 +269,10 @@ public abstract class CollectionPage : MediaPage {
         set_action_sensitive("SetBackground", (!selection_has_videos) && has_selected );
         if (has_selected) {
             debug ("Setting action label for SetBackground...");
-/*            Gtk.Action? set_background = get_action("SetBackground");
-            if (set_background != null) {
-                set_background.label = one_selected
+            var label = one_selected
                     ? Resources.SET_BACKGROUND_MENU
                     : Resources.SET_BACKGROUND_SLIDESHOW_MENU;
-            } */
+            this.update_menu_item_label ("SetBackground", label);
         }
     }
 
diff --git a/src/ColorTransformation.c b/src/ColorTransformation.c
index 2fec21a..20e9f70 100644
--- a/src/ColorTransformation.c
+++ b/src/ColorTransformation.c
@@ -1,4 +1,4 @@
-/* ColorTransformation.c generated by valac 0.34.2, the Vala compiler
+/* ColorTransformation.c generated by valac 0.32.1, the Vala compiler
  * generated from ColorTransformation.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12067,19 +12067,19 @@ static gchar* string_chug (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1199 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strchug (_tmp1_);
-#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 12080 "ColorTransformation.c"
 }
@@ -12090,19 +12090,19 @@ static gchar* string_chomp (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1191 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strchomp (_tmp1_);
-#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 12103 "ColorTransformation.c"
 }
diff --git a/src/CommandManager.c b/src/CommandManager.c
index cd4c8a2..60cb438 100644
--- a/src/CommandManager.c
+++ b/src/CommandManager.c
@@ -1,4 +1,4 @@
-/* CommandManager.c generated by valac 0.34.2, the Vala compiler
+/* CommandManager.c generated by valac 0.32.1, the Vala compiler
  * generated from CommandManager.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Commands.c b/src/Commands.c
index c0a4447..7211f77 100644
--- a/src/Commands.c
+++ b/src/Commands.c
@@ -1,4 +1,4 @@
-/* Commands.c generated by valac 0.34.2, the Vala compiler
+/* Commands.c generated by valac 0.32.1, the Vala compiler
  * generated from Commands.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -5446,7 +5446,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 #line 448 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5449 "Commands.c"
-				goto __catch454_database_error;
+				goto __catch452_database_error;
 			}
 			{
 				AppWindow* _tmp7_ = NULL;
@@ -5470,8 +5470,8 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 #line 5471 "Commands.c"
 		}
 	}
-	goto __finally454;
-	__catch454_database_error:
+	goto __finally452;
+	__catch452_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -5487,7 +5487,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 		_g_error_free0 (err);
 #line 5489 "Commands.c"
 	}
-	__finally454:
+	__finally452:
 	{
 		AppWindow* _tmp10_ = NULL;
 		AppWindow* _tmp11_ = NULL;
@@ -5583,7 +5583,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 #line 468 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5586 "Commands.c"
-				goto __catch455_database_error;
+				goto __catch453_database_error;
 			}
 			{
 				AppWindow* _tmp7_ = NULL;
@@ -5607,8 +5607,8 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 #line 5608 "Commands.c"
 		}
 	}
-	goto __finally455;
-	__catch455_database_error:
+	goto __finally453;
+	__catch453_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -5624,7 +5624,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 		_g_error_free0 (err);
 #line 5626 "Commands.c"
 	}
-	__finally455:
+	__finally453:
 	{
 		AppWindow* _tmp10_ = NULL;
 		AppWindow* _tmp11_ = NULL;
@@ -10094,7 +10094,7 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 #line 1118 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10097 "Commands.c"
-			goto __catch456_g_error;
+			goto __catch454_g_error;
 		}
 #line 1119 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->dupes;
@@ -10104,8 +10104,8 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		_g_object_unref0 (dupe);
 #line 10106 "Commands.c"
 	}
-	goto __finally456;
-	__catch456_g_error:
+	goto __finally454;
+	__catch454_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp4_ = NULL;
@@ -10145,7 +10145,7 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		_g_error_free0 (err);
 #line 10147 "Commands.c"
 	}
-	__finally456:
+	__finally454:
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11543,11 +11543,11 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 #line 1345 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 11546 "Commands.c"
-				goto __catch457_g_error;
+				goto __catch455_g_error;
 			}
 		}
-		goto __finally457;
-		__catch457_g_error:
+		goto __finally455;
+		__catch455_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp5_ = NULL;
@@ -11563,7 +11563,7 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 			_g_error_free0 (err);
 #line 11565 "Commands.c"
 		}
-		__finally457:
+		__finally455:
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12149,11 +12149,11 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 #line 1435 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12152 "Commands.c"
-				goto __catch458_g_error;
+				goto __catch456_g_error;
 			}
 		}
-		goto __finally458;
-		__catch458_g_error:
+		goto __finally456;
+		__catch456_g_error:
 		{
 			GError* err = NULL;
 			GeeArrayList* _tmp5_ = NULL;
@@ -12172,7 +12172,7 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 			_g_error_free0 (err);
 #line 12174 "Commands.c"
 		}
-		__finally458:
+		__finally456:
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14570,11 +14570,11 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 14580 "Commands.c"
 	{
@@ -14589,98 +14589,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 14611 "Commands.c"
-				goto __catch459_g_regex_error;
+				goto __catch457_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 14620 "Commands.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 14636 "Commands.c"
-				goto __catch459_g_regex_error;
+				goto __catch457_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 14647 "Commands.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 14661 "Commands.c"
 	}
-	goto __finally459;
-	__catch459_g_regex_error:
+	goto __finally457;
+	__catch457_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 14675 "Commands.c"
 	}
-	__finally459:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	__finally457:
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
 #line 14686 "Commands.c"
 	}
@@ -15981,37 +15981,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 15997 "Commands.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 16005 "Commands.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 16017 "Commands.c"
 	}
@@ -16031,112 +16031,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 16041 "Commands.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 16047 "Commands.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 16051 "Commands.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 16055 "Commands.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 16067 "Commands.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 16077 "Commands.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 16083 "Commands.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 16097 "Commands.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 16107 "Commands.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 16113 "Commands.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 16122 "Commands.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 16142 "Commands.c"
 }
diff --git a/src/CustomComponents.c b/src/CustomComponents.c
index 843ff3f..053e2fa 100644
--- a/src/CustomComponents.c
+++ b/src/CustomComponents.c
@@ -1,4 +1,4 @@
-/* CustomComponents.c generated by valac 0.34.2, the Vala compiler
+/* CustomComponents.c generated by valac 0.32.1, the Vala compiler
  * generated from CustomComponents.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Debug.c b/src/Debug.c
index 5ce4ad8..7711599 100644
--- a/src/Debug.c
+++ b/src/Debug.c
@@ -1,4 +1,4 @@
-/* Debug.c generated by valac 0.34.2, the Vala compiler
+/* Debug.c generated by valac 0.32.1, the Vala compiler
  * generated from Debug.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -198,7 +198,7 @@ void debug_init (const gchar* app_version_prefix) {
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 201 "Debug.c"
-					goto __catch431_g_error;
+					goto __catch429_g_error;
 				}
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
 				if (!_tmp13_) {
@@ -225,8 +225,8 @@ void debug_init (const gchar* app_version_prefix) {
 				}
 			}
 		}
-		goto __finally431;
-		__catch431_g_error:
+		goto __finally429;
+		__catch429_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp20_ = NULL;
@@ -250,7 +250,7 @@ void debug_init (const gchar* app_version_prefix) {
 			_g_error_free0 (err);
 #line 252 "Debug.c"
 		}
-		__finally431:
+		__finally429:
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -526,13 +526,13 @@ gboolean debug_is_enabled (GLogLevelFlags flag) {
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return;
 #line 538 "Debug.c"
 }
@@ -547,23 +547,23 @@ static gchar* g_time_to_string (struct tm *self) {
 	gint _tmp4_ = 0;
 	gint _tmp5_ = 0;
 	gchar* _tmp6_ = NULL;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = (*self).tm_year;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = (*self).tm_mon;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = (*self).tm_mday;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = (*self).tm_hour;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = (*self).tm_min;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp5_ = (*self).tm_sec;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp6_ = g_strdup_printf ("%04d-%02d-%02d %02d:%02d:%02d", _tmp0_ + 1900, _tmp1_ + 1, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp6_;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 569 "Debug.c"
 }
diff --git a/src/DesktopIntegration.c b/src/DesktopIntegration.c
index b82e24c..63d3682 100644
--- a/src/DesktopIntegration.c
+++ b/src/DesktopIntegration.c
@@ -1,4 +1,4 @@
-/* DesktopIntegration.c generated by valac 0.34.2, the Vala compiler
+/* DesktopIntegration.c generated by valac 0.32.1, the Vala compiler
  * generated from DesktopIntegration.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -484,17 +484,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 500 "DesktopIntegration.c"
 }
@@ -1173,7 +1173,7 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 #line 110 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1176 "DesktopIntegration.c"
-			goto __catch564_g_error;
+			goto __catch562_g_error;
 		}
 #line 118 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp21_ = app_window_get_instance ();
@@ -1185,8 +1185,8 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 		_g_object_unref0 (_tmp22_);
 #line 1187 "DesktopIntegration.c"
 	}
-	goto __finally564;
-	__catch564_g_error:
+	goto __finally562;
+	__catch562_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp23_ = NULL;
@@ -1226,7 +1226,7 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 		_g_error_free0 (err);
 #line 1228 "DesktopIntegration.c"
 	}
-	__finally564:
+	__finally562:
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1568,11 +1568,11 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea
 #line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1571 "DesktopIntegration.c"
-			goto __catch565_g_error;
+			goto __catch563_g_error;
 		}
 	}
-	goto __finally565;
-	__catch565_g_error:
+	goto __finally563;
+	__catch563_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp27_ = NULL;
@@ -1617,7 +1617,7 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea
 		return;
 #line 1619 "DesktopIntegration.c"
 	}
-	__finally565:
+	__finally563:
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1802,7 +1802,7 @@ void desktop_integration_background_slideshow_xml_builder_open (DesktopIntegrati
 #line 1803 "DesktopIntegration.c"
 	}
 #line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp3_ = g_data_output_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_output_stream_get_type (), GOutputStream));
+	_tmp3_ = g_data_output_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OUTPUT_STREAM, GOutputStream));
 #line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_g_object_unref0 (self->priv->outs);
 #line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2200,7 +2200,7 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr
 #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	_tmp7_ = self->priv->outs;
 #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, g_output_stream_get_type (), GOutputStream), NULL, &_inner_error_);
+	g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OUTPUT_STREAM, GOutputStream), NULL, &_inner_error_);
 #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2588,11 +2588,11 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 #line 278 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2591 "DesktopIntegration.c"
-			goto __catch566_g_error;
+			goto __catch564_g_error;
 		}
 	}
-	goto __finally566;
-	__catch566_g_error:
+	goto __finally564;
+	__catch564_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp8_ = NULL;
@@ -2612,7 +2612,7 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 		_g_error_free0 (err);
 #line 2613 "DesktopIntegration.c"
 	}
-	__finally566:
+	__finally564:
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2747,7 +2747,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 #line 304 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2749 "DesktopIntegration.c"
-			goto __catch567_g_error;
+			goto __catch565_g_error;
 		}
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp10_ = exporter;
@@ -2789,7 +2789,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 						file_collection = (_vala_array_free (file_collection, file_collection_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 2791 "DesktopIntegration.c"
-						goto __catch567_g_error;
+						goto __catch565_g_error;
 					}
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 					_g_object_unref0 (file);
@@ -2809,7 +2809,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2811 "DesktopIntegration.c"
-			goto __catch567_g_error;
+			goto __catch565_g_error;
 		}
 #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp19_ = _tmp16_;
@@ -2823,8 +2823,8 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		_g_object_unref0 (_tmp16_);
 #line 2824 "DesktopIntegration.c"
 	}
-	goto __finally567;
-	__catch567_g_error:
+	goto __finally565;
+	__catch565_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp20_ = NULL;
@@ -2860,7 +2860,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		return;
 #line 2861 "DesktopIntegration.c"
 	}
-	__finally567:
+	__finally565:
 #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
diff --git a/src/Dialogs.c b/src/Dialogs.c
index 36504c7..3db0786 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -1,4 +1,4 @@
-/* Dialogs.c generated by valac 0.34.2, the Vala compiler
+/* Dialogs.c generated by valac 0.32.1, the Vala compiler
  * generated from Dialogs.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -17,9 +17,9 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <gee.h>
-#include <gdk/gdk.h>
 #include <float.h>
 #include <math.h>
+#include <gdk/gdk.h>
 #include <time.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gobject/gvaluecollector.h>
@@ -294,18 +294,6 @@ typedef struct _EntryMultiCompletion EntryMultiCompletion;
 typedef struct _EntryMultiCompletionClass EntryMultiCompletionClass;
 typedef struct _EntryMultiCompletionPrivate EntryMultiCompletionPrivate;
 
-#define TYPE_SET_BACKGROUND_DIALOG (set_background_dialog_get_type ())
-#define SET_BACKGROUND_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog))
-#define SET_BACKGROUND_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialogClass))
-#define IS_SET_BACKGROUND_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SET_BACKGROUND_DIALOG))
-#define IS_SET_BACKGROUND_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SET_BACKGROUND_DIALOG))
-#define SET_BACKGROUND_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialogClass))
-
-typedef struct _SetBackgroundDialog SetBackgroundDialog;
-typedef struct _SetBackgroundDialogClass SetBackgroundDialogClass;
-typedef struct _SetBackgroundDialogPrivate SetBackgroundDialogPrivate;
-typedef struct _ParamSpecSetBackgroundDialog ParamSpecSetBackgroundDialog;
-
 #define TYPE_SET_BACKGROUND_PHOTO_DIALOG (set_background_photo_dialog_get_type ())
 #define SET_BACKGROUND_PHOTO_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog))
 #define SET_BACKGROUND_PHOTO_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogClass))
@@ -821,48 +809,34 @@ struct _EntryMultiCompletionPrivate {
 	gchar* delimiter;
 };
 
-struct _SetBackgroundDialog {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	SetBackgroundDialogPrivate * priv;
-	GtkDialog* dialog;
-	GtkCheckButton* desktop_background_button;
-	GtkCheckButton* screensaver_button;
-	GtkButton* ok_button;
-	gboolean desktop;
-	gboolean screensaver;
-};
-
-struct _SetBackgroundDialogClass {
-	GTypeClass parent_class;
-	void (*finalize) (SetBackgroundDialog *self);
-};
-
-struct _ParamSpecSetBackgroundDialog {
-	GParamSpec parent_instance;
-};
-
 struct _SetBackgroundPhotoDialog {
-	SetBackgroundDialog parent_instance;
+	GtkDialog parent_instance;
 	SetBackgroundPhotoDialogPrivate * priv;
 };
 
 struct _SetBackgroundPhotoDialogClass {
-	SetBackgroundDialogClass parent_class;
+	GtkDialogClass parent_class;
+};
+
+struct _SetBackgroundPhotoDialogPrivate {
+	GtkCheckButton* desktop_background_checkbox;
+	GtkCheckButton* screensaver_checkbox;
 };
 
 struct _SetBackgroundSlideshowDialog {
-	SetBackgroundDialog parent_instance;
+	GtkDialog parent_instance;
 	SetBackgroundSlideshowDialogPrivate * priv;
 };
 
 struct _SetBackgroundSlideshowDialogClass {
-	SetBackgroundDialogClass parent_class;
+	GtkDialogClass parent_class;
 };
 
 struct _SetBackgroundSlideshowDialogPrivate {
-	GtkLabel* delay_value_label;
+	GtkCheckButton* desktop_background_checkbox;
+	GtkCheckButton* screensaver_checkbox;
 	GtkScale* delay_scale;
+	GtkLabel* delay_value_label;
 	gint delay_value;
 };
 
@@ -1124,7 +1098,6 @@ static gpointer import_ui_question_params_parent_class = NULL;
 static gpointer text_entry_dialog_mediator_parent_class = NULL;
 static gpointer multi_text_entry_dialog_mediator_parent_class = NULL;
 static gpointer entry_multi_completion_parent_class = NULL;
-static gpointer set_background_dialog_parent_class = NULL;
 static gpointer set_background_photo_dialog_parent_class = NULL;
 static gpointer set_background_slideshow_dialog_parent_class = NULL;
 static gpointer text_entry_dialog_parent_class = NULL;
@@ -1358,28 +1331,17 @@ static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_fu
 static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar* delimiter);
 static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* base, GtkTreeModel* model, GtkTreeIter* iter);
 static void entry_multi_completion_finalize (GObject* obj);
-gpointer set_background_dialog_ref (gpointer instance);
-void set_background_dialog_unref (gpointer instance);
-GParamSpec* param_spec_set_background_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_set_background_dialog (GValue* value, gpointer v_object);
-void value_take_set_background_dialog (GValue* value, gpointer v_object);
-gpointer value_get_set_background_dialog (const GValue* value);
-GType set_background_dialog_get_type (void) G_GNUC_CONST;
-enum  {
-	SET_BACKGROUND_DIALOG_DUMMY_PROPERTY
-};
-SetBackgroundDialog* set_background_dialog_construct (GType object_type, GtkBuilder* builder);
-void set_background_dialog_on_checkbox_clicked (SetBackgroundDialog* self);
-static void _set_background_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
-gboolean set_background_dialog_execute_base (SetBackgroundDialog* self);
-static void set_background_dialog_finalize (SetBackgroundDialog* obj);
 GType set_background_photo_dialog_get_type (void) G_GNUC_CONST;
+#define SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogPrivate))
 enum  {
 	SET_BACKGROUND_PHOTO_DIALOG_DUMMY_PROPERTY
 };
 SetBackgroundPhotoDialog* set_background_photo_dialog_new (void);
 SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type);
+static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self);
+static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
 gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver);
+static void set_background_photo_dialog_finalize (GObject* obj);
 GType set_background_slideshow_dialog_get_type (void) G_GNUC_CONST;
 #define SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialogPrivate))
 enum  {
@@ -1387,10 +1349,13 @@ enum  {
 };
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void);
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type);
+static void set_background_slideshow_dialog_real_constructed (GObject* base);
 static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self);
+static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self);
+static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
 static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self);
 gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver);
-static void set_background_slideshow_dialog_finalize (SetBackgroundDialog* obj);
+static void set_background_slideshow_dialog_finalize (GObject* obj);
 #define TEXT_ENTRY_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TEXT_ENTRY_DIALOG, TextEntryDialogPrivate))
 enum  {
 	TEXT_ENTRY_DIALOG_DUMMY_PROPERTY
@@ -1750,7 +1715,7 @@ gboolean dialogs_confirm_delete_tag (Tag* tag) {
 		result = TRUE;
 #line 14 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 1754 "Dialogs.c"
+#line 1719 "Dialogs.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = count;
@@ -1786,7 +1751,7 @@ gboolean dialogs_confirm_delete_tag (Tag* tag) {
 	_g_free0 (msg);
 #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1790 "Dialogs.c"
+#line 1755 "Dialogs.c"
 }
 
 
@@ -1832,7 +1797,7 @@ gboolean dialogs_confirm_delete_saved_search (SavedSearch* search) {
 	_g_free0 (msg);
 #line 28 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1836 "Dialogs.c"
+#line 1801 "Dialogs.c"
 }
 
 
@@ -1886,7 +1851,7 @@ gboolean dialogs_confirm_warn_developer_changed (gint number) {
 	_g_object_unref0 (dialog);
 #line 46 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1888 "Dialogs.c"
+#line 1853 "Dialogs.c"
 }
 
 
@@ -1922,7 +1887,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp0_ = export_ui_current_export_dir;
 #line 55 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 1924 "Dialogs.c"
+#line 1889 "Dialogs.c"
 		const gchar* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -1933,7 +1898,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp2_;
-#line 1935 "Dialogs.c"
+#line 1900 "Dialogs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = current_file_basename;
@@ -1941,20 +1906,20 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp5_ = video_reader_is_supported_video_filename (_tmp4_);
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 1943 "Dialogs.c"
+#line 1908 "Dialogs.c"
 		const gchar* _tmp6_ = NULL;
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _ ("Export Video");
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp6_;
-#line 1949 "Dialogs.c"
+#line 1914 "Dialogs.c"
 	} else {
 		const gchar* _tmp7_ = NULL;
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _ ("Export Photo");
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp7_;
-#line 1956 "Dialogs.c"
+#line 1921 "Dialogs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = g_strdup (_tmp3_);
@@ -2010,7 +1975,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp23_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog));
 #line 70 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2012 "Dialogs.c"
+#line 1977 "Dialogs.c"
 		GtkFileChooserDialog* _tmp24_ = NULL;
 		gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
@@ -2039,7 +2004,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 72 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp29_;
-#line 2041 "Dialogs.c"
+#line 2006 "Dialogs.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = chooser;
@@ -2053,14 +2018,14 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_g_free0 (file_chooser_title);
 #line 76 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2055 "Dialogs.c"
+#line 2020 "Dialogs.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2062 "Dialogs.c"
+#line 2027 "Dialogs.c"
 }
 
 
@@ -2087,7 +2052,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	_tmp0_ = export_ui_current_export_dir;
 #line 80 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 2089 "Dialogs.c"
+#line 2054 "Dialogs.c"
 		const gchar* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 #line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2098,19 +2063,19 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp2_;
-#line 2100 "Dialogs.c"
+#line 2065 "Dialogs.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = user_title;
 #line 83 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == NULL) {
-#line 2106 "Dialogs.c"
+#line 2071 "Dialogs.c"
 		const gchar* _tmp4_ = NULL;
 #line 84 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _ ("Export Photos");
 #line 84 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		user_title = _tmp4_;
-#line 2112 "Dialogs.c"
+#line 2077 "Dialogs.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = user_title;
@@ -2152,7 +2117,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	_tmp16_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_dialog_get_type (), GtkDialog));
 #line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2154 "Dialogs.c"
+#line 2119 "Dialogs.c"
 		GtkFileChooserDialog* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
@@ -2181,7 +2146,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp22_;
-#line 2183 "Dialogs.c"
+#line 2148 "Dialogs.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = chooser;
@@ -2193,7 +2158,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	_g_object_unref0 (chooser);
 #line 100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2195 "Dialogs.c"
+#line 2160 "Dialogs.c"
 }
 
 
@@ -2208,18 +2173,18 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 	if (g_error_matches (_tmp1_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) {
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 2210 "Dialogs.c"
+#line 2175 "Dialogs.c"
 	} else {
 		GError* _tmp2_ = NULL;
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = err;
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = g_error_matches (_tmp2_, G_FILE_ERROR, G_FILE_ERROR_PERM);
-#line 2217 "Dialogs.c"
+#line 2182 "Dialogs.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 2221 "Dialogs.c"
+#line 2186 "Dialogs.c"
 		const gchar* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
@@ -2261,7 +2226,7 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 		_g_object_unref0 (_tmp8_);
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2262 "Dialogs.c"
+#line 2227 "Dialogs.c"
 	} else {
 		GError* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
@@ -2276,7 +2241,7 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 		app_window_error_message (_tmp15_, NULL);
 #line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp15_);
-#line 2277 "Dialogs.c"
+#line 2242 "Dialogs.c"
 	}
 }
 
@@ -2316,7 +2281,7 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 	_tmp6_ = photos_remaining;
 #line 126 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_) {
-#line 2317 "Dialogs.c"
+#line 2282 "Dialogs.c"
 		const gchar* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -2341,14 +2306,14 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 		_tmp12_ = app_window_affirm_cancel_question (_tmp10_, _tmp11_, NULL, NULL);
 #line 128 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		response = _tmp12_;
-#line 2342 "Dialogs.c"
+#line 2307 "Dialogs.c"
 	} else {
 		const gchar* _tmp13_ = NULL;
 #line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = message;
 #line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		app_window_error_message (_tmp13_, NULL);
-#line 2349 "Dialogs.c"
+#line 2314 "Dialogs.c"
 	}
 #line 133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = response;
@@ -2356,42 +2321,42 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 	_g_free0 (message);
 #line 133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2357 "Dialogs.c"
+#line 2322 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_constraint_changed ((ExportDialog*) self);
-#line 2364 "Dialogs.c"
+#line 2329 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_format_changed ((ExportDialog*) self);
-#line 2371 "Dialogs.c"
+#line 2336 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_pixels_changed ((ExportDialog*) self);
-#line 2378 "Dialogs.c"
+#line 2343 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
 #line 217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_pixels_insert_text ((ExportDialog*) self, new_text, new_text_length, position);
-#line 2385 "Dialogs.c"
+#line 2350 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self) {
 #line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_activate ((ExportDialog*) self);
-#line 2392 "Dialogs.c"
+#line 2357 "Dialogs.c"
 }
 
 
@@ -2475,11 +2440,11 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	if (_tmp2_) {
 #line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 2476 "Dialogs.c"
+#line 2441 "Dialogs.c"
 	} else {
 #line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 2480 "Dialogs.c"
+#line 2445 "Dialogs.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ExportDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
@@ -2539,7 +2504,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	self->priv->quality_combo = _tmp17_;
 #line 185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ctr = 0;
-#line 2540 "Dialogs.c"
+#line 2505 "Dialogs.c"
 	{
 		JpegQuality* quality_collection = NULL;
 		gint quality_collection_length1 = 0;
@@ -2551,11 +2516,11 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		quality_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY);
 #line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (quality_it = 0; quality_it < G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY); quality_it = quality_it + 1) {
-#line 2552 "Dialogs.c"
+#line 2517 "Dialogs.c"
 			JpegQuality quality = 0;
 #line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			quality = quality_collection[quality_it];
-#line 2556 "Dialogs.c"
+#line 2521 "Dialogs.c"
 			{
 				GtkComboBoxText* _tmp18_ = NULL;
 				JpegQuality _tmp19_ = 0;
@@ -2585,7 +2550,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 				_tmp24_ = _tmp23_.quality;
 #line 188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp22_ == _tmp24_) {
-#line 2586 "Dialogs.c"
+#line 2551 "Dialogs.c"
 					GtkComboBoxText* _tmp25_ = NULL;
 					gint _tmp26_ = 0;
 #line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2594,13 +2559,13 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 					_tmp26_ = ctr;
 #line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), _tmp26_);
-#line 2595 "Dialogs.c"
+#line 2560 "Dialogs.c"
 				}
 #line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = ctr;
 #line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				ctr = _tmp27_ + 1;
-#line 2601 "Dialogs.c"
+#line 2566 "Dialogs.c"
 			}
 		}
 	}
@@ -2614,7 +2579,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	self->priv->constraint_combo = _tmp28_;
 #line 194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ctr = 0;
-#line 2615 "Dialogs.c"
+#line 2580 "Dialogs.c"
 	{
 		ScaleConstraint* constraint_collection = NULL;
 		gint constraint_collection_length1 = 0;
@@ -2626,11 +2591,11 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		constraint_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY);
 #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (constraint_it = 0; constraint_it < G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY); constraint_it = constraint_it + 1) {
-#line 2627 "Dialogs.c"
+#line 2592 "Dialogs.c"
 			ScaleConstraint constraint = 0;
 #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			constraint = constraint_collection[constraint_it];
-#line 2631 "Dialogs.c"
+#line 2596 "Dialogs.c"
 			{
 				GtkComboBoxText* _tmp29_ = NULL;
 				ScaleConstraint _tmp30_ = 0;
@@ -2657,7 +2622,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 				_tmp34_ = export_dialog_current_constraint;
 #line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp33_ == _tmp34_) {
-#line 2658 "Dialogs.c"
+#line 2623 "Dialogs.c"
 					GtkComboBoxText* _tmp35_ = NULL;
 					gint _tmp36_ = 0;
 #line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2666,13 +2631,13 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 					_tmp36_ = ctr;
 #line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), _tmp36_);
-#line 2667 "Dialogs.c"
+#line 2632 "Dialogs.c"
 				}
 #line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp37_ = ctr;
 #line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				ctr = _tmp37_ + 1;
-#line 2673 "Dialogs.c"
+#line 2638 "Dialogs.c"
 			}
 		}
 	}
@@ -2690,7 +2655,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	export_dialog_format_add_option (self, EXPORT_DIALOG_CURRENT_FORMAT_LABEL);
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = photo_file_format_get_writeable (&_tmp39_);
-#line 2691 "Dialogs.c"
+#line 2656 "Dialogs.c"
 	{
 		PhotoFileFormat* format_collection = NULL;
 		gint format_collection_length1 = 0;
@@ -2702,11 +2667,11 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		format_collection_length1 = _tmp39_;
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (format_it = 0; format_it < _tmp39_; format_it = format_it + 1) {
-#line 2703 "Dialogs.c"
+#line 2668 "Dialogs.c"
 			PhotoFileFormat format = 0;
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			format = format_collection[format_it];
-#line 2707 "Dialogs.c"
+#line 2672 "Dialogs.c"
 			{
 				PhotoFileFormat _tmp41_ = 0;
 				PhotoFileFormatProperties* _tmp42_ = NULL;
@@ -2729,12 +2694,12 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 				_g_free0 (_tmp45_);
 #line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_photo_file_format_properties_unref0 (_tmp43_);
-#line 2730 "Dialogs.c"
+#line 2695 "Dialogs.c"
 			}
 		}
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		format_collection = (g_free (format_collection), NULL);
-#line 2735 "Dialogs.c"
+#line 2700 "Dialogs.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = (GtkEntry*) gtk_entry_new ();
@@ -2892,7 +2857,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	_tmp85_ = export_dialog_current_constraint;
 #line 254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp85_ == SCALE_CONSTRAINT_ORIGINAL) {
-#line 2893 "Dialogs.c"
+#line 2858 "Dialogs.c"
 		GtkEntry* _tmp86_ = NULL;
 		GtkComboBoxText* _tmp87_ = NULL;
 #line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2903,7 +2868,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		_tmp87_ = self->priv->quality_combo;
 #line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2904 "Dialogs.c"
+#line 2869 "Dialogs.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = self->priv->ok_button;
@@ -2913,14 +2878,14 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	_g_object_unref0 (config);
 #line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 2914 "Dialogs.c"
+#line 2879 "Dialogs.c"
 }
 
 
 ExportDialog* export_dialog_new (const gchar* title) {
 #line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return export_dialog_construct (TYPE_EXPORT_DIALOG, title);
-#line 2921 "Dialogs.c"
+#line 2886 "Dialogs.c"
 }
 
 
@@ -2945,7 +2910,7 @@ static void export_dialog_format_add_option (ExportDialog* self, const gchar* fo
 	_tmp3_ = format_name;
 #line 264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp2_, _tmp3_);
-#line 2946 "Dialogs.c"
+#line 2911 "Dialogs.c"
 }
 
 
@@ -2958,7 +2923,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 	g_return_if_fail (text != NULL);
 #line 268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	selection_ticker = 0;
-#line 2959 "Dialogs.c"
+#line 2924 "Dialogs.c"
 	{
 		GeeArrayList* _current_text_list = NULL;
 		GeeArrayList* _tmp0_ = NULL;
@@ -2986,7 +2951,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 		_current_text_index = -1;
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 2987 "Dialogs.c"
+#line 2952 "Dialogs.c"
 			gint _tmp5_ = 0;
 			gint _tmp6_ = 0;
 			gint _tmp7_ = 0;
@@ -3009,7 +2974,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 			if (!(_tmp6_ < _tmp7_)) {
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 3010 "Dialogs.c"
+#line 2975 "Dialogs.c"
 			}
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _current_text_list;
@@ -3025,7 +2990,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 			_tmp12_ = text;
 #line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (g_strcmp0 (_tmp11_, _tmp12_) == 0) {
-#line 3026 "Dialogs.c"
+#line 2991 "Dialogs.c"
 				GtkComboBoxText* _tmp13_ = NULL;
 				gint _tmp14_ = 0;
 #line 272 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3040,7 +3005,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 				_g_object_unref0 (_current_text_list);
 #line 273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return;
-#line 3041 "Dialogs.c"
+#line 3006 "Dialogs.c"
 			}
 #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = selection_ticker;
@@ -3048,17 +3013,17 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 			selection_ticker = _tmp15_ + 1;
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (current_text);
-#line 3049 "Dialogs.c"
+#line 3014 "Dialogs.c"
 		}
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_text_list);
-#line 3053 "Dialogs.c"
+#line 3018 "Dialogs.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = text;
 #line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_error ("Dialogs.vala:278: format_set_active_text: text '%s' isn't in combo box", _tmp16_);
-#line 3059 "Dialogs.c"
+#line 3024 "Dialogs.c"
 }
 
 
@@ -3090,7 +3055,7 @@ static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) {
 	if (_tmp2_ < EXPORT_DIALOG_NUM_SPECIAL_FORMATS) {
 #line 284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		index = EXPORT_DIALOG_NUM_SPECIAL_FORMATS;
-#line 3091 "Dialogs.c"
+#line 3056 "Dialogs.c"
 	}
 #line 286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = index;
@@ -3114,7 +3079,7 @@ static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) {
 	writeable_formats = (g_free (writeable_formats), NULL);
 #line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 3115 "Dialogs.c"
+#line 3080 "Dialogs.c"
 }
 
 
@@ -3134,7 +3099,7 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 	switch (_tmp1_) {
 #line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 3135 "Dialogs.c"
+#line 3100 "Dialogs.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3143,11 +3108,11 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 			result = _tmp2_;
 #line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3144 "Dialogs.c"
+#line 3109 "Dialogs.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 3148 "Dialogs.c"
+#line 3113 "Dialogs.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3156,11 +3121,11 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 			result = _tmp3_;
 #line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3157 "Dialogs.c"
+#line 3122 "Dialogs.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 3161 "Dialogs.c"
+#line 3126 "Dialogs.c"
 		{
 			ExportFormatParameters _tmp4_ = {0};
 			PhotoFileFormat _tmp5_ = 0;
@@ -3186,14 +3151,14 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 			result = _tmp9_;
 #line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3187 "Dialogs.c"
+#line 3152 "Dialogs.c"
 		}
 		default:
 		{
 #line 303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_error ("Dialogs.vala:303: get_label_for_parameters: unrecognized export format" \
 " mode");
-#line 3193 "Dialogs.c"
+#line 3158 "Dialogs.c"
 		}
 	}
 }
@@ -3225,7 +3190,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	_tmp1_ = _tmp0_.mode;
 #line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ != EXPORT_FORMAT_MODE_LAST) {
-#line 3225 "Dialogs.c"
+#line 3190 "Dialogs.c"
 		ScaleConstraint _tmp2_ = 0;
 		GtkComboBoxText* _tmp3_ = NULL;
 #line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3238,7 +3203,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp3_ = self->priv->constraint_combo;
 #line 318 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 3238 "Dialogs.c"
+#line 3203 "Dialogs.c"
 	}
 #line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = *parameters;
@@ -3246,13 +3211,13 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	_tmp5_ = _tmp4_.mode;
 #line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ == EXPORT_FORMAT_MODE_LAST) {
-#line 3246 "Dialogs.c"
+#line 3211 "Dialogs.c"
 		ExportFormatParameters _tmp6_ = {0};
 #line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = export_dialog_current_parameters;
 #line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*parameters = _tmp6_;
-#line 3252 "Dialogs.c"
+#line 3217 "Dialogs.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
 		ExportFormatParameters _tmp8_ = {0};
@@ -3263,7 +3228,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp9_ = _tmp8_.mode;
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_ == EXPORT_FORMAT_MODE_SPECIFIED) {
-#line 3263 "Dialogs.c"
+#line 3228 "Dialogs.c"
 			ExportFormatParameters _tmp10_ = {0};
 			PhotoFileFormat _tmp11_ = 0;
 			gboolean _tmp12_ = FALSE;
@@ -3275,21 +3240,21 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_tmp12_ = photo_file_format_can_write (_tmp11_);
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = !_tmp12_;
-#line 3275 "Dialogs.c"
+#line 3240 "Dialogs.c"
 		} else {
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = FALSE;
-#line 3279 "Dialogs.c"
+#line 3244 "Dialogs.c"
 		}
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp7_) {
-#line 3283 "Dialogs.c"
+#line 3248 "Dialogs.c"
 			PhotoFileFormat _tmp13_ = 0;
 #line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = photo_file_format_get_system_default_format ();
 #line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			(*parameters).specified_format = _tmp13_;
-#line 3289 "Dialogs.c"
+#line 3254 "Dialogs.c"
 		}
 	}
 #line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3312,7 +3277,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	_tmp18_ = ok;
 #line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp18_) {
-#line 3312 "Dialogs.c"
+#line 3277 "Dialogs.c"
 		gint index = 0;
 		GtkComboBoxText* _tmp19_ = NULL;
 		gint _tmp20_ = 0;
@@ -3383,13 +3348,13 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp28_ = _vala_constraint;
 #line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp28_ != SCALE_CONSTRAINT_ORIGINAL) {
-#line 3383 "Dialogs.c"
+#line 3348 "Dialogs.c"
 			gint _tmp29_ = 0;
 #line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = _vala_scale;
 #line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_assert (_tmp29_ > 0, "scale > 0");
-#line 3389 "Dialogs.c"
+#line 3354 "Dialogs.c"
 		}
 #line 339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = _vala_scale;
@@ -3403,7 +3368,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp34_ = _tmp33_;
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp34_) {
-#line 3403 "Dialogs.c"
+#line 3368 "Dialogs.c"
 			GtkSwitch* _tmp35_ = NULL;
 			gboolean _tmp36_ = FALSE;
 			gboolean _tmp37_ = FALSE;
@@ -3415,11 +3380,11 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_tmp37_ = _tmp36_;
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = _tmp37_;
-#line 3415 "Dialogs.c"
+#line 3380 "Dialogs.c"
 		} else {
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = FALSE;
-#line 3419 "Dialogs.c"
+#line 3384 "Dialogs.c"
 		}
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		(*parameters).export_metadata = _tmp31_;
@@ -3435,7 +3400,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_g_free0 (_tmp40_);
 #line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp41_) {
-#line 3435 "Dialogs.c"
+#line 3400 "Dialogs.c"
 			ExportFormatMode _tmp42_ = 0;
 #line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_UNMODIFIED;
@@ -3443,7 +3408,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_tmp42_ = export_dialog_current_parameters.mode;
 #line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			(*parameters).mode = _tmp42_;
-#line 3443 "Dialogs.c"
+#line 3408 "Dialogs.c"
 		} else {
 			GtkComboBoxText* _tmp43_ = NULL;
 			gchar* _tmp44_ = NULL;
@@ -3461,7 +3426,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_g_free0 (_tmp45_);
 #line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp46_) {
-#line 3461 "Dialogs.c"
+#line 3426 "Dialogs.c"
 				ExportFormatMode _tmp47_ = 0;
 #line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_CURRENT;
@@ -3469,7 +3434,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 				_tmp47_ = export_dialog_current_parameters.mode;
 #line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				(*parameters).mode = _tmp47_;
-#line 3469 "Dialogs.c"
+#line 3434 "Dialogs.c"
 			} else {
 				ExportFormatMode _tmp48_ = 0;
 				PhotoFileFormat _tmp49_ = 0;
@@ -3496,7 +3461,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 				_tmp52_ = _tmp51_.specified_format;
 #line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp52_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 3496 "Dialogs.c"
+#line 3461 "Dialogs.c"
 					GtkComboBoxText* _tmp53_ = NULL;
 					gint _tmp54_ = 0;
 					JpegQuality _tmp55_ = 0;
@@ -3513,7 +3478,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 					_tmp56_ = export_dialog_current_parameters.quality;
 #line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					(*parameters).quality = _tmp56_;
-#line 3513 "Dialogs.c"
+#line 3478 "Dialogs.c"
 				}
 			}
 		}
@@ -3567,13 +3532,13 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		configuration_facade_set_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp73_);
 #line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (config);
-#line 3567 "Dialogs.c"
+#line 3532 "Dialogs.c"
 	} else {
 #line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_scale = 0;
 #line 364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_constraint = SCALE_CONSTRAINT_ORIGINAL;
-#line 3573 "Dialogs.c"
+#line 3538 "Dialogs.c"
 	}
 #line 367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -3583,17 +3548,17 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	if (scale) {
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*scale = _vala_scale;
-#line 3583 "Dialogs.c"
+#line 3548 "Dialogs.c"
 	}
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (constraint) {
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*constraint = _vala_constraint;
-#line 3589 "Dialogs.c"
+#line 3554 "Dialogs.c"
 	}
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 3593 "Dialogs.c"
+#line 3558 "Dialogs.c"
 }
 
 
@@ -3639,7 +3604,7 @@ static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint
 	_tmp5_ = widget;
 #line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 3639 "Dialogs.c"
+#line 3604 "Dialogs.c"
 		GtkLabel* _tmp6_ = NULL;
 		GtkWidget* _tmp7_ = NULL;
 #line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3648,7 +3613,7 @@ static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint
 		_tmp7_ = widget;
 #line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_mnemonic_widget (_tmp6_, _tmp7_);
-#line 3648 "Dialogs.c"
+#line 3613 "Dialogs.c"
 	}
 #line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->table;
@@ -3662,7 +3627,7 @@ static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint
 	gtk_grid_attach (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_, _tmp11_, 1, 1);
 #line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (new_label);
-#line 3662 "Dialogs.c"
+#line 3627 "Dialogs.c"
 }
 
 
@@ -3705,7 +3670,7 @@ static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gi
 	_tmp7_ = y;
 #line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_grid_attach (_tmp4_, _tmp5_, _tmp6_, _tmp7_, 1, 1);
-#line 3705 "Dialogs.c"
+#line 3670 "Dialogs.c"
 }
 
 
@@ -3773,17 +3738,17 @@ static void export_dialog_on_constraint_changed (ExportDialog* self) {
 	_tmp14_ = original;
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp14_) {
-#line 3773 "Dialogs.c"
+#line 3738 "Dialogs.c"
 		gboolean _tmp15_ = FALSE;
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = jpeg;
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp15_;
-#line 3779 "Dialogs.c"
+#line 3744 "Dialogs.c"
 	} else {
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = FALSE;
-#line 3783 "Dialogs.c"
+#line 3748 "Dialogs.c"
 	}
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->quality_combo;
@@ -3793,17 +3758,17 @@ static void export_dialog_on_constraint_changed (ExportDialog* self) {
 	_tmp17_ = original;
 #line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp17_) {
-#line 3793 "Dialogs.c"
+#line 3758 "Dialogs.c"
 		GtkWidget* _tmp18_ = NULL;
 #line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->ok_button;
 #line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (_tmp18_, TRUE);
-#line 3799 "Dialogs.c"
+#line 3764 "Dialogs.c"
 	} else {
 #line 402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_dialog_on_pixels_changed (self);
-#line 3803 "Dialogs.c"
+#line 3768 "Dialogs.c"
 	}
 }
 
@@ -3839,7 +3804,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 	_g_free0 (_tmp5_);
 #line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_) {
-#line 3839 "Dialogs.c"
+#line 3804 "Dialogs.c"
 		GtkComboBoxText* _tmp7_ = NULL;
 		GtkComboBoxText* _tmp8_ = NULL;
 		GtkComboBoxText* _tmp9_ = NULL;
@@ -3870,7 +3835,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 		_tmp12_ = self->priv->export_metadata;
 #line 418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3870 "Dialogs.c"
+#line 3835 "Dialogs.c"
 	} else {
 		GtkComboBoxText* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
@@ -3888,7 +3853,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 		_g_free0 (_tmp15_);
 #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp16_) {
-#line 3888 "Dialogs.c"
+#line 3853 "Dialogs.c"
 			GtkComboBoxText* _tmp17_ = NULL;
 			GtkComboBoxText* _tmp18_ = NULL;
 			GtkEntry* _tmp19_ = NULL;
@@ -3912,7 +3877,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 			_tmp21_ = self->priv->export_metadata;
 #line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3912 "Dialogs.c"
+#line 3877 "Dialogs.c"
 		} else {
 			GtkComboBoxText* _tmp22_ = NULL;
 			gboolean jpeg = FALSE;
@@ -3933,17 +3898,17 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 			_tmp25_ = original;
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp25_) {
-#line 3933 "Dialogs.c"
+#line 3898 "Dialogs.c"
 				gboolean _tmp26_ = FALSE;
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = jpeg;
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = _tmp26_;
-#line 3939 "Dialogs.c"
+#line 3904 "Dialogs.c"
 			} else {
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = FALSE;
-#line 3943 "Dialogs.c"
+#line 3908 "Dialogs.c"
 			}
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = self->priv->quality_combo;
@@ -3953,7 +3918,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 			_tmp28_ = self->priv->export_metadata;
 #line 437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3953 "Dialogs.c"
+#line 3918 "Dialogs.c"
 		}
 	}
 }
@@ -3964,7 +3929,7 @@ static void export_dialog_on_activate (ExportDialog* self) {
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
 #line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 3964 "Dialogs.c"
+#line 3929 "Dialogs.c"
 }
 
 
@@ -3981,7 +3946,7 @@ static void export_dialog_on_pixels_changed (ExportDialog* self) {
 	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (((gint) _tmp2_) > 0) {
-#line 3981 "Dialogs.c"
+#line 3946 "Dialogs.c"
 		GtkEntry* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
@@ -3993,17 +3958,17 @@ static void export_dialog_on_pixels_changed (ExportDialog* self) {
 		_tmp5_ = atoi (_tmp4_);
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp5_ > 0;
-#line 3993 "Dialogs.c"
+#line 3958 "Dialogs.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 3997 "Dialogs.c"
+#line 3962 "Dialogs.c"
 	}
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = self->priv->ok_button;
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (_tmp6_, _tmp0_);
-#line 4003 "Dialogs.c"
+#line 3968 "Dialogs.c"
 }
 
 
@@ -4011,17 +3976,17 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 4021 "Dialogs.c"
+#line 3986 "Dialogs.c"
 }
 
 
@@ -4044,7 +4009,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	if (_tmp0_) {
 #line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 4044 "Dialogs.c"
+#line 4009 "Dialogs.c"
 	}
 #line 454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->in_insert = TRUE;
@@ -4052,7 +4017,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	_tmp1_ = length;
 #line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == -1) {
-#line 4052 "Dialogs.c"
+#line 4017 "Dialogs.c"
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
@@ -4064,25 +4029,25 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 		_tmp4_ = _tmp3_;
 #line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		length = (gint) _tmp4_;
-#line 4064 "Dialogs.c"
+#line 4029 "Dialogs.c"
 	}
 #line 460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = g_strdup ("");
 #line 460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	new_text = _tmp5_;
-#line 4070 "Dialogs.c"
+#line 4035 "Dialogs.c"
 	{
 		gint ctr = 0;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ctr = 0;
-#line 4075 "Dialogs.c"
+#line 4040 "Dialogs.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = TRUE;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 4082 "Dialogs.c"
+#line 4047 "Dialogs.c"
 				gint _tmp8_ = 0;
 				gint _tmp9_ = 0;
 				const gchar* _tmp10_ = NULL;
@@ -4091,13 +4056,13 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 				gboolean _tmp13_ = FALSE;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
-#line 4091 "Dialogs.c"
+#line 4056 "Dialogs.c"
 					gint _tmp7_ = 0;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = ctr;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					ctr = _tmp7_ + 1;
-#line 4097 "Dialogs.c"
+#line 4062 "Dialogs.c"
 				}
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
@@ -4109,7 +4074,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 				if (!(_tmp8_ < _tmp9_)) {
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 4109 "Dialogs.c"
+#line 4074 "Dialogs.c"
 				}
 #line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = text;
@@ -4121,7 +4086,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 				_tmp13_ = g_ascii_isdigit (_tmp12_);
 #line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_) {
-#line 4121 "Dialogs.c"
+#line 4086 "Dialogs.c"
 					const gchar* _tmp14_ = NULL;
 					const gchar* _tmp15_ = NULL;
 					gint _tmp16_ = 0;
@@ -4149,7 +4114,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 					new_text = _tmp20_;
 #line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_free0 (_tmp19_);
-#line 4149 "Dialogs.c"
+#line 4114 "Dialogs.c"
 				}
 			}
 		}
@@ -4162,7 +4127,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	_tmp23_ = _tmp22_;
 #line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ > 0) {
-#line 4162 "Dialogs.c"
+#line 4127 "Dialogs.c"
 		GtkEntry* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
@@ -4180,7 +4145,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 		_tmp28_ = _tmp27_;
 #line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 4180 "Dialogs.c"
+#line 4145 "Dialogs.c"
 	}
 #line 470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->pixels_entry;
@@ -4190,7 +4155,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	self->priv->in_insert = FALSE;
 #line 449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (new_text);
-#line 4190 "Dialogs.c"
+#line 4155 "Dialogs.c"
 }
 
 
@@ -4208,7 +4173,7 @@ static void export_dialog_class_init (ExportDialogClass * klass) {
 	export_dialog_current_parameters = _tmp0_;
 #line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_current_scale = EXPORT_DIALOG_DEFAULT_SCALE;
-#line 4208 "Dialogs.c"
+#line 4173 "Dialogs.c"
 }
 
 
@@ -4229,7 +4194,7 @@ static void export_dialog_instance_init (ExportDialog * self) {
 	self->priv->format_options = _tmp1_;
 #line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->in_insert = FALSE;
-#line 4229 "Dialogs.c"
+#line 4194 "Dialogs.c"
 }
 
 
@@ -4255,7 +4220,7 @@ static void export_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->ok_button);
 #line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (export_dialog_parent_class)->finalize (obj);
-#line 4255 "Dialogs.c"
+#line 4220 "Dialogs.c"
 }
 
 
@@ -4297,25 +4262,25 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 		result = NULL;
 #line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 4297 "Dialogs.c"
+#line 4262 "Dialogs.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup ("");
 #line 486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	list = _tmp3_;
-#line 4303 "Dialogs.c"
+#line 4268 "Dialogs.c"
 	{
 		gint ctr = 0;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ctr = 0;
-#line 4308 "Dialogs.c"
+#line 4273 "Dialogs.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = TRUE;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 4315 "Dialogs.c"
+#line 4280 "Dialogs.c"
 				gboolean _tmp6_ = FALSE;
 				gint _tmp7_ = 0;
 				const gchar* _tmp12_ = NULL;
@@ -4326,13 +4291,13 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 				gchar* _tmp27_ = NULL;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp4_) {
-#line 4326 "Dialogs.c"
+#line 4291 "Dialogs.c"
 					gint _tmp5_ = 0;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp5_ = ctr;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					ctr = _tmp5_ + 1;
-#line 4332 "Dialogs.c"
+#line 4297 "Dialogs.c"
 				}
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp4_ = FALSE;
@@ -4340,7 +4305,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 				_tmp7_ = ctr;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp7_ < IMPORT_UI_REPORT_FAILURE_COUNT) {
-#line 4340 "Dialogs.c"
+#line 4305 "Dialogs.c"
 					gint _tmp8_ = 0;
 					GeeList* _tmp9_ = NULL;
 					gint _tmp10_ = 0;
@@ -4355,23 +4320,23 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 					_tmp11_ = _tmp10_;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = _tmp8_ < _tmp11_;
-#line 4355 "Dialogs.c"
+#line 4320 "Dialogs.c"
 				} else {
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = FALSE;
-#line 4359 "Dialogs.c"
+#line 4324 "Dialogs.c"
 				}
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 4365 "Dialogs.c"
+#line 4330 "Dialogs.c"
 				}
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = show_dest_id;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_) {
-#line 4371 "Dialogs.c"
+#line 4336 "Dialogs.c"
 					GeeList* _tmp14_ = NULL;
 					gint _tmp15_ = 0;
 					gpointer _tmp16_ = NULL;
@@ -4391,7 +4356,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 					_tmp12_ = _tmp18_;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_batch_import_result_unref0 (_tmp17_);
-#line 4391 "Dialogs.c"
+#line 4356 "Dialogs.c"
 				} else {
 					GeeList* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
@@ -4412,7 +4377,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 					_tmp12_ = _tmp23_;
 #line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_batch_import_result_unref0 (_tmp22_);
-#line 4412 "Dialogs.c"
+#line 4377 "Dialogs.c"
 				}
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = list;
@@ -4428,7 +4393,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 				list = _tmp27_;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp26_);
-#line 4428 "Dialogs.c"
+#line 4393 "Dialogs.c"
 			}
 		}
 	}
@@ -4444,7 +4409,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 	_tmp31_ = remaining;
 #line 493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp31_ > 0) {
-#line 4444 "Dialogs.c"
+#line 4409 "Dialogs.c"
 		const gchar* _tmp32_ = NULL;
 		const gchar* _tmp33_ = NULL;
 		gint _tmp34_ = 0;
@@ -4469,13 +4434,13 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 		list = _tmp37_;
 #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp36_);
-#line 4469 "Dialogs.c"
+#line 4434 "Dialogs.c"
 	}
 #line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = list;
 #line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4475 "Dialogs.c"
+#line 4440 "Dialogs.c"
 }
 
 
@@ -4521,21 +4486,21 @@ ImportUIQuestionParams* import_ui_question_params_construct (GType object_type,
 	self->no_button = _tmp5_;
 #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 4521 "Dialogs.c"
+#line 4486 "Dialogs.c"
 }
 
 
 ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, const gchar* yes_button, const gchar* no_button) {
 #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return import_ui_question_params_construct (IMPORT_UI_TYPE_QUESTION_PARAMS, question, yes_button, no_button);
-#line 4528 "Dialogs.c"
+#line 4493 "Dialogs.c"
 }
 
 
 static void import_ui_value_question_params_init (GValue* value) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 4535 "Dialogs.c"
+#line 4500 "Dialogs.c"
 }
 
 
@@ -4544,7 +4509,7 @@ static void import_ui_value_question_params_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (value->data[0].v_pointer);
-#line 4544 "Dialogs.c"
+#line 4509 "Dialogs.c"
 	}
 }
 
@@ -4554,11 +4519,11 @@ static void import_ui_value_question_params_copy_value (const GValue* src_value,
 	if (src_value->data[0].v_pointer) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = import_ui_question_params_ref (src_value->data[0].v_pointer);
-#line 4554 "Dialogs.c"
+#line 4519 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4558 "Dialogs.c"
+#line 4523 "Dialogs.c"
 	}
 }
 
@@ -4566,37 +4531,37 @@ static void import_ui_value_question_params_copy_value (const GValue* src_value,
 static gpointer import_ui_value_question_params_peek_pointer (const GValue* value) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 4566 "Dialogs.c"
+#line 4531 "Dialogs.c"
 }
 
 
 static gchar* import_ui_value_question_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 4573 "Dialogs.c"
+#line 4538 "Dialogs.c"
 		ImportUIQuestionParams* object;
 		object = collect_values[0].v_pointer;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4580 "Dialogs.c"
+#line 4545 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4584 "Dialogs.c"
+#line 4549 "Dialogs.c"
 		}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = import_ui_question_params_ref (object);
-#line 4588 "Dialogs.c"
+#line 4553 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4592 "Dialogs.c"
+#line 4557 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 4596 "Dialogs.c"
+#line 4561 "Dialogs.c"
 }
 
 
@@ -4607,25 +4572,25 @@ static gchar* import_ui_value_question_params_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4607 "Dialogs.c"
+#line 4572 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 4613 "Dialogs.c"
+#line 4578 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4617 "Dialogs.c"
+#line 4582 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = import_ui_question_params_ref (value->data[0].v_pointer);
-#line 4621 "Dialogs.c"
+#line 4586 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 4625 "Dialogs.c"
+#line 4590 "Dialogs.c"
 }
 
 
@@ -4639,7 +4604,7 @@ GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 4639 "Dialogs.c"
+#line 4604 "Dialogs.c"
 }
 
 
@@ -4648,7 +4613,7 @@ gpointer import_ui_value_get_question_params (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS), NULL);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 4648 "Dialogs.c"
+#line 4613 "Dialogs.c"
 }
 
 
@@ -4668,17 +4633,17 @@ void import_ui_value_set_question_params (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_ref (value->data[0].v_pointer);
-#line 4668 "Dialogs.c"
+#line 4633 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4672 "Dialogs.c"
+#line 4637 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (old);
-#line 4678 "Dialogs.c"
+#line 4643 "Dialogs.c"
 	}
 }
 
@@ -4697,17 +4662,17 @@ void import_ui_value_take_question_params (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 4697 "Dialogs.c"
+#line 4662 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4701 "Dialogs.c"
+#line 4666 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (old);
-#line 4707 "Dialogs.c"
+#line 4672 "Dialogs.c"
 	}
 }
 
@@ -4717,14 +4682,14 @@ static void import_ui_question_params_class_init (ImportUIQuestionParamsClass *
 	import_ui_question_params_parent_class = g_type_class_peek_parent (klass);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((ImportUIQuestionParamsClass *) klass)->finalize = import_ui_question_params_finalize;
-#line 4717 "Dialogs.c"
+#line 4682 "Dialogs.c"
 }
 
 
 static void import_ui_question_params_instance_init (ImportUIQuestionParams * self) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 4724 "Dialogs.c"
+#line 4689 "Dialogs.c"
 }
 
 
@@ -4740,7 +4705,7 @@ static void import_ui_question_params_finalize (ImportUIQuestionParams* obj) {
 	_g_free0 (self->yes_button);
 #line 502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->no_button);
-#line 4740 "Dialogs.c"
+#line 4705 "Dialogs.c"
 }
 
 
@@ -4765,7 +4730,7 @@ gpointer import_ui_question_params_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 4765 "Dialogs.c"
+#line 4730 "Dialogs.c"
 }
 
 
@@ -4778,7 +4743,7 @@ void import_ui_question_params_unref (gpointer instance) {
 		IMPORT_UI_QUESTION_PARAMS_GET_CLASS (self)->finalize (self);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4778 "Dialogs.c"
+#line 4743 "Dialogs.c"
 	}
 }
 
@@ -4787,7 +4752,7 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 	gboolean result = FALSE;
 #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE);
-#line 4787 "Dialogs.c"
+#line 4752 "Dialogs.c"
 	{
 		GeeIterator* _current_result_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -4800,7 +4765,7 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 		_current_result_it = _tmp1_;
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 4800 "Dialogs.c"
+#line 4765 "Dialogs.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			BatchImportResult* current_result = NULL;
@@ -4817,7 +4782,7 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 			if (!_tmp3_) {
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 4817 "Dialogs.c"
+#line 4782 "Dialogs.c"
 			}
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _current_result_it;
@@ -4831,7 +4796,7 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 			_tmp8_ = _tmp7_->file;
 #line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp8_ != NULL) {
-#line 4831 "Dialogs.c"
+#line 4796 "Dialogs.c"
 				BatchImportResult* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
 				PhotoFileFormat _tmp11_ = 0;
@@ -4843,11 +4808,11 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 				_tmp11_ = photo_file_format_get_by_file_extension (_tmp10_);
 #line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = _tmp11_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 4843 "Dialogs.c"
+#line 4808 "Dialogs.c"
 			} else {
 #line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 4847 "Dialogs.c"
+#line 4812 "Dialogs.c"
 			}
 #line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp6_) {
@@ -4859,21 +4824,21 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 				_g_object_unref0 (_current_result_it);
 #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4859 "Dialogs.c"
+#line 4824 "Dialogs.c"
 			}
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_batch_import_result_unref0 (current_result);
-#line 4863 "Dialogs.c"
+#line 4828 "Dialogs.c"
 		}
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_result_it);
-#line 4867 "Dialogs.c"
+#line 4832 "Dialogs.c"
 	}
 #line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
 #line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4873 "Dialogs.c"
+#line 4838 "Dialogs.c"
 }
 
 
@@ -4881,7 +4846,7 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 	gboolean result = FALSE;
 #line 521 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE);
-#line 4881 "Dialogs.c"
+#line 4846 "Dialogs.c"
 	{
 		GeeIterator* _current_result_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -4894,7 +4859,7 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 		_current_result_it = _tmp1_;
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 4894 "Dialogs.c"
+#line 4859 "Dialogs.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			BatchImportResult* current_result = NULL;
@@ -4911,7 +4876,7 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 			if (!_tmp3_) {
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 4911 "Dialogs.c"
+#line 4876 "Dialogs.c"
 			}
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _current_result_it;
@@ -4925,7 +4890,7 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 			_tmp8_ = _tmp7_->file;
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp8_ != NULL) {
-#line 4925 "Dialogs.c"
+#line 4890 "Dialogs.c"
 				BatchImportResult* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
@@ -4937,11 +4902,11 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 				_tmp11_ = video_reader_is_supported_video_file (_tmp10_);
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = _tmp11_;
-#line 4937 "Dialogs.c"
+#line 4902 "Dialogs.c"
 			} else {
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 4941 "Dialogs.c"
+#line 4906 "Dialogs.c"
 			}
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp6_) {
@@ -4953,21 +4918,21 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 				_g_object_unref0 (_current_result_it);
 #line 524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4953 "Dialogs.c"
+#line 4918 "Dialogs.c"
 			}
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_batch_import_result_unref0 (current_result);
-#line 4957 "Dialogs.c"
+#line 4922 "Dialogs.c"
 		}
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_result_it);
-#line 4961 "Dialogs.c"
+#line 4926 "Dialogs.c"
 	}
 #line 526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
 #line 526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4967 "Dialogs.c"
+#line 4932 "Dialogs.c"
 }
 
 
@@ -5007,21 +4972,21 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 	_tmp5_ = has_photos;
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 5007 "Dialogs.c"
+#line 4972 "Dialogs.c"
 		gboolean _tmp6_ = FALSE;
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = has_videos;
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp6_;
-#line 5013 "Dialogs.c"
+#line 4978 "Dialogs.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = FALSE;
-#line 5017 "Dialogs.c"
+#line 4982 "Dialogs.c"
 	}
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 5021 "Dialogs.c"
+#line 4986 "Dialogs.c"
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 #line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5032,14 +4997,14 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 		result = _tmp8_;
 #line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 5032 "Dialogs.c"
+#line 4997 "Dialogs.c"
 	} else {
 		gboolean _tmp9_ = FALSE;
 #line 536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = has_photos;
 #line 536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_) {
-#line 5039 "Dialogs.c"
+#line 5004 "Dialogs.c"
 			const gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
 #line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5050,14 +5015,14 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 			result = _tmp11_;
 #line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 5050 "Dialogs.c"
+#line 5015 "Dialogs.c"
 		} else {
 			gboolean _tmp12_ = FALSE;
 #line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = has_videos;
 #line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp12_) {
-#line 5057 "Dialogs.c"
+#line 5022 "Dialogs.c"
 				const gchar* _tmp13_ = NULL;
 				gchar* _tmp14_ = NULL;
 #line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5068,7 +5033,7 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 				result = _tmp14_;
 #line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 5068 "Dialogs.c"
+#line 5033 "Dialogs.c"
 			} else {
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
@@ -5080,7 +5045,7 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 				result = _tmp16_;
 #line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 5080 "Dialogs.c"
+#line 5045 "Dialogs.c"
 			}
 		}
 	}
@@ -5313,7 +5278,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp50_ = _tmp49_;
 #line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp50_ > 0) {
-#line 5313 "Dialogs.c"
+#line 5278 "Dialogs.c"
 		GString* _tmp51_ = NULL;
 		const gchar* _tmp52_ = NULL;
 		gchar* _tmp53_ = NULL;
@@ -5330,7 +5295,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp51_, _tmp54_);
 #line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp54_);
-#line 5330 "Dialogs.c"
+#line 5295 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp55_ = NULL;
@@ -5361,7 +5326,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5361 "Dialogs.c"
+#line 5326 "Dialogs.c"
 				gint _tmp61_ = 0;
 				gint _tmp62_ = 0;
 				gint _tmp63_ = 0;
@@ -5401,7 +5366,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp62_ < _tmp63_)) {
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5401 "Dialogs.c"
+#line 5366 "Dialogs.c"
 				}
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp64_ = _result_list;
@@ -5471,11 +5436,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp85_, _tmp86_);
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5471 "Dialogs.c"
+#line 5436 "Dialogs.c"
 			}
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5475 "Dialogs.c"
+#line 5440 "Dialogs.c"
 		}
 	}
 #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5488,7 +5453,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp90_ = _tmp89_;
 #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp90_ > 0) {
-#line 5488 "Dialogs.c"
+#line 5453 "Dialogs.c"
 		GString* _tmp91_ = NULL;
 		const gchar* _tmp92_ = NULL;
 		gchar* _tmp93_ = NULL;
@@ -5505,7 +5470,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp91_, _tmp94_);
 #line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp94_);
-#line 5505 "Dialogs.c"
+#line 5470 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp95_ = NULL;
@@ -5536,7 +5501,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5536 "Dialogs.c"
+#line 5501 "Dialogs.c"
 				gint _tmp101_ = 0;
 				gint _tmp102_ = 0;
 				gint _tmp103_ = 0;
@@ -5572,7 +5537,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp102_ < _tmp103_)) {
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5572 "Dialogs.c"
+#line 5537 "Dialogs.c"
 				}
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp104_ = _result_list;
@@ -5630,11 +5595,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp121_, _tmp122_);
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5630 "Dialogs.c"
+#line 5595 "Dialogs.c"
 			}
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5634 "Dialogs.c"
+#line 5599 "Dialogs.c"
 		}
 	}
 #line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5647,7 +5612,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp126_ = _tmp125_;
 #line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp126_ > 0) {
-#line 5647 "Dialogs.c"
+#line 5612 "Dialogs.c"
 		GString* _tmp127_ = NULL;
 		const gchar* _tmp128_ = NULL;
 		gchar* _tmp129_ = NULL;
@@ -5665,7 +5630,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp127_, _tmp130_);
 #line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp130_);
-#line 5664 "Dialogs.c"
+#line 5629 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp131_ = NULL;
@@ -5696,7 +5661,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5695 "Dialogs.c"
+#line 5660 "Dialogs.c"
 				gint _tmp137_ = 0;
 				gint _tmp138_ = 0;
 				gint _tmp139_ = 0;
@@ -5732,7 +5697,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp138_ < _tmp139_)) {
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5731 "Dialogs.c"
+#line 5696 "Dialogs.c"
 				}
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp140_ = _result_list;
@@ -5790,11 +5755,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp157_, _tmp158_);
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5789 "Dialogs.c"
+#line 5754 "Dialogs.c"
 			}
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5793 "Dialogs.c"
+#line 5758 "Dialogs.c"
 		}
 	}
 #line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5807,7 +5772,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp162_ = _tmp161_;
 #line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp162_ > 0) {
-#line 5806 "Dialogs.c"
+#line 5771 "Dialogs.c"
 		GString* _tmp163_ = NULL;
 		const gchar* _tmp164_ = NULL;
 		gchar* _tmp165_ = NULL;
@@ -5825,7 +5790,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp163_, _tmp166_);
 #line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp166_);
-#line 5823 "Dialogs.c"
+#line 5788 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp167_ = NULL;
@@ -5856,7 +5821,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5854 "Dialogs.c"
+#line 5819 "Dialogs.c"
 				gint _tmp173_ = 0;
 				gint _tmp174_ = 0;
 				gint _tmp175_ = 0;
@@ -5892,7 +5857,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp174_ < _tmp175_)) {
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5890 "Dialogs.c"
+#line 5855 "Dialogs.c"
 				}
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp176_ = _result_list;
@@ -5950,11 +5915,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp193_, _tmp194_);
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5948 "Dialogs.c"
+#line 5913 "Dialogs.c"
 			}
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5952 "Dialogs.c"
+#line 5917 "Dialogs.c"
 		}
 	}
 #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5967,7 +5932,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp198_ = _tmp197_;
 #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp198_ > 0) {
-#line 5965 "Dialogs.c"
+#line 5930 "Dialogs.c"
 		GString* _tmp199_ = NULL;
 		const gchar* _tmp200_ = NULL;
 		gchar* _tmp201_ = NULL;
@@ -5985,7 +5950,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp199_, _tmp202_);
 #line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp202_);
-#line 5982 "Dialogs.c"
+#line 5947 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp203_ = NULL;
@@ -6016,7 +5981,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6013 "Dialogs.c"
+#line 5978 "Dialogs.c"
 				gint _tmp209_ = 0;
 				gint _tmp210_ = 0;
 				gint _tmp211_ = 0;
@@ -6057,7 +6022,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp210_ < _tmp211_)) {
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6054 "Dialogs.c"
+#line 6019 "Dialogs.c"
 				}
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp212_ = _result_list;
@@ -6127,11 +6092,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp234_, _tmp235_);
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6124 "Dialogs.c"
+#line 6089 "Dialogs.c"
 			}
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6128 "Dialogs.c"
+#line 6093 "Dialogs.c"
 		}
 	}
 #line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6144,7 +6109,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp239_ = _tmp238_;
 #line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp239_ > 0) {
-#line 6141 "Dialogs.c"
+#line 6106 "Dialogs.c"
 		GString* _tmp240_ = NULL;
 		const gchar* _tmp241_ = NULL;
 		gchar* _tmp242_ = NULL;
@@ -6161,7 +6126,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp240_, _tmp243_);
 #line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp243_);
-#line 6158 "Dialogs.c"
+#line 6123 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp244_ = NULL;
@@ -6192,7 +6157,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6189 "Dialogs.c"
+#line 6154 "Dialogs.c"
 				gint _tmp250_ = 0;
 				gint _tmp251_ = 0;
 				gint _tmp252_ = 0;
@@ -6228,7 +6193,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp251_ < _tmp252_)) {
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6225 "Dialogs.c"
+#line 6190 "Dialogs.c"
 				}
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp253_ = _result_list;
@@ -6286,11 +6251,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp270_, _tmp271_);
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6283 "Dialogs.c"
+#line 6248 "Dialogs.c"
 			}
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6287 "Dialogs.c"
+#line 6252 "Dialogs.c"
 		}
 	}
 #line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6303,7 +6268,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp275_ = _tmp274_;
 #line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp275_ > 0) {
-#line 6300 "Dialogs.c"
+#line 6265 "Dialogs.c"
 		GString* _tmp276_ = NULL;
 		const gchar* _tmp277_ = NULL;
 		gchar* _tmp278_ = NULL;
@@ -6320,7 +6285,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp276_, _tmp279_);
 #line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp279_);
-#line 6317 "Dialogs.c"
+#line 6282 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp280_ = NULL;
@@ -6351,7 +6316,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6348 "Dialogs.c"
+#line 6313 "Dialogs.c"
 				gint _tmp286_ = 0;
 				gint _tmp287_ = 0;
 				gint _tmp288_ = 0;
@@ -6387,7 +6352,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp287_ < _tmp288_)) {
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6384 "Dialogs.c"
+#line 6349 "Dialogs.c"
 				}
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp289_ = _result_list;
@@ -6445,11 +6410,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp306_, _tmp307_);
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6442 "Dialogs.c"
+#line 6407 "Dialogs.c"
 			}
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6446 "Dialogs.c"
+#line 6411 "Dialogs.c"
 		}
 	}
 #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6470,7 +6435,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_g_string_free0 (builder);
 #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 6467 "Dialogs.c"
+#line 6432 "Dialogs.c"
 }
 
 
@@ -6579,7 +6544,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp4_ = _tmp3_;
 #line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_ > 0) {
-#line 6576 "Dialogs.c"
+#line 6541 "Dialogs.c"
 		gchar* photos_message = NULL;
 		ImportManifest* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
@@ -6748,7 +6713,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 6745 "Dialogs.c"
+#line 6710 "Dialogs.c"
 	}
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = manifest;
@@ -6760,7 +6725,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp55_ = _tmp54_;
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp55_ > 0) {
-#line 6757 "Dialogs.c"
+#line 6722 "Dialogs.c"
 		const gchar* _tmp56_ = NULL;
 		gint _tmp57_ = 0;
 		gint _tmp58_ = 0;
@@ -6833,7 +6798,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp58_ = _tmp57_;
 #line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp58_ > 0) {
-#line 6830 "Dialogs.c"
+#line 6795 "Dialogs.c"
 			const gchar* _tmp59_ = NULL;
 			gchar* _tmp60_ = NULL;
 #line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6844,7 +6809,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp60_;
-#line 6841 "Dialogs.c"
+#line 6806 "Dialogs.c"
 		}
 #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp61_ = manifest;
@@ -6988,7 +6953,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 6985 "Dialogs.c"
+#line 6950 "Dialogs.c"
 	}
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp118_ = manifest;
@@ -7000,7 +6965,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp121_ = _tmp120_;
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp121_ > 0) {
-#line 6997 "Dialogs.c"
+#line 6962 "Dialogs.c"
 		const gchar* _tmp122_ = NULL;
 		gint _tmp123_ = 0;
 		gint _tmp124_ = 0;
@@ -7073,7 +7038,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp124_ = _tmp123_;
 #line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp124_ > 0) {
-#line 7070 "Dialogs.c"
+#line 7035 "Dialogs.c"
 			const gchar* _tmp125_ = NULL;
 			gchar* _tmp126_ = NULL;
 #line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7084,7 +7049,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp126_;
-#line 7081 "Dialogs.c"
+#line 7046 "Dialogs.c"
 		}
 #line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp127_ = manifest;
@@ -7236,7 +7201,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7225 "Dialogs.c"
+#line 7190 "Dialogs.c"
 	}
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp184_ = manifest;
@@ -7248,7 +7213,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp187_ = _tmp186_;
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp187_ > 0) {
-#line 7237 "Dialogs.c"
+#line 7202 "Dialogs.c"
 		const gchar* _tmp188_ = NULL;
 		gint _tmp189_ = 0;
 		gint _tmp190_ = 0;
@@ -7321,7 +7286,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp190_ = _tmp189_;
 #line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp190_ > 0) {
-#line 7310 "Dialogs.c"
+#line 7275 "Dialogs.c"
 			const gchar* _tmp191_ = NULL;
 			gchar* _tmp192_ = NULL;
 #line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7332,7 +7297,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp192_;
-#line 7321 "Dialogs.c"
+#line 7286 "Dialogs.c"
 		}
 #line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp193_ = manifest;
@@ -7476,7 +7441,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7465 "Dialogs.c"
+#line 7430 "Dialogs.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp250_ = manifest;
@@ -7488,7 +7453,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp253_ = _tmp252_;
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp253_ > 0) {
-#line 7477 "Dialogs.c"
+#line 7442 "Dialogs.c"
 		const gchar* _tmp254_ = NULL;
 		gint _tmp255_ = 0;
 		gint _tmp256_ = 0;
@@ -7561,7 +7526,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp256_ = _tmp255_;
 #line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp256_ > 0) {
-#line 7550 "Dialogs.c"
+#line 7515 "Dialogs.c"
 			const gchar* _tmp257_ = NULL;
 			gchar* _tmp258_ = NULL;
 #line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7572,7 +7537,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp258_;
-#line 7561 "Dialogs.c"
+#line 7526 "Dialogs.c"
 		}
 #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp259_ = manifest;
@@ -7716,7 +7681,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7705 "Dialogs.c"
+#line 7670 "Dialogs.c"
 	}
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp316_ = manifest;
@@ -7728,7 +7693,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp319_ = _tmp318_;
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp319_ > 0) {
-#line 7717 "Dialogs.c"
+#line 7682 "Dialogs.c"
 		const gchar* _tmp320_ = NULL;
 		gint _tmp321_ = 0;
 		gint _tmp322_ = 0;
@@ -7761,7 +7726,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp322_ = _tmp321_;
 #line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp322_ > 0) {
-#line 7750 "Dialogs.c"
+#line 7715 "Dialogs.c"
 			const gchar* _tmp323_ = NULL;
 			gchar* _tmp324_ = NULL;
 #line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7772,7 +7737,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp324_;
-#line 7761 "Dialogs.c"
+#line 7726 "Dialogs.c"
 		}
 #line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp325_ = manifest;
@@ -7828,7 +7793,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (_tmp343_);
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (skipped_photos_message);
-#line 7817 "Dialogs.c"
+#line 7782 "Dialogs.c"
 	}
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp345_ = manifest;
@@ -7840,7 +7805,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp348_ = _tmp347_;
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp348_ > 0) {
-#line 7829 "Dialogs.c"
+#line 7794 "Dialogs.c"
 		const gchar* _tmp349_ = NULL;
 		gint _tmp350_ = 0;
 		gint _tmp351_ = 0;
@@ -7866,7 +7831,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp351_ = _tmp350_;
 #line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp351_ > 0) {
-#line 7855 "Dialogs.c"
+#line 7820 "Dialogs.c"
 			const gchar* _tmp352_ = NULL;
 			gchar* _tmp353_ = NULL;
 #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7877,7 +7842,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp353_;
-#line 7866 "Dialogs.c"
+#line 7831 "Dialogs.c"
 		}
 #line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp354_ = manifest;
@@ -7913,7 +7878,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		message = _tmp366_;
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (skipped_files_message);
-#line 7902 "Dialogs.c"
+#line 7867 "Dialogs.c"
 	}
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp367_ = manifest;
@@ -7925,7 +7890,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp370_ = _tmp369_;
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp370_ > 0) {
-#line 7914 "Dialogs.c"
+#line 7879 "Dialogs.c"
 		const gchar* _tmp371_ = NULL;
 		gint _tmp372_ = 0;
 		gint _tmp373_ = 0;
@@ -7998,7 +7963,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp373_ = _tmp372_;
 #line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp373_ > 0) {
-#line 7987 "Dialogs.c"
+#line 7952 "Dialogs.c"
 			const gchar* _tmp374_ = NULL;
 			gchar* _tmp375_ = NULL;
 #line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -8009,7 +7974,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp375_;
-#line 7998 "Dialogs.c"
+#line 7963 "Dialogs.c"
 		}
 #line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp376_ = manifest;
@@ -8153,7 +8118,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 8142 "Dialogs.c"
+#line 8107 "Dialogs.c"
 	}
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp433_ = manifest;
@@ -8165,7 +8130,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp436_ = _tmp435_;
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp436_ > 0) {
-#line 8154 "Dialogs.c"
+#line 8119 "Dialogs.c"
 		const gchar* _tmp437_ = NULL;
 		gint _tmp438_ = 0;
 		gint _tmp439_ = 0;
@@ -8219,7 +8184,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp439_ = _tmp438_;
 #line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp439_ > 0) {
-#line 8208 "Dialogs.c"
+#line 8173 "Dialogs.c"
 			const gchar* _tmp440_ = NULL;
 			gchar* _tmp441_ = NULL;
 #line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -8230,7 +8195,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp441_;
-#line 8219 "Dialogs.c"
+#line 8184 "Dialogs.c"
 		}
 #line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp442_ = manifest;
@@ -8328,7 +8293,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 8317 "Dialogs.c"
+#line 8282 "Dialogs.c"
 	}
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp481_ = manifest;
@@ -8420,7 +8385,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp522_ = total;
 #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp522_ == 0) {
-#line 8409 "Dialogs.c"
+#line 8374 "Dialogs.c"
 		const gchar* _tmp523_ = NULL;
 		const gchar* _tmp524_ = NULL;
 		gchar* _tmp525_ = NULL;
@@ -8434,7 +8399,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (message);
 #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp525_;
-#line 8423 "Dialogs.c"
+#line 8388 "Dialogs.c"
 	}
 #line 864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = NULL;
@@ -8444,7 +8409,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp526_ = question;
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp526_ == NULL) {
-#line 8433 "Dialogs.c"
+#line 8398 "Dialogs.c"
 		AppWindow* _tmp527_ = NULL;
 		AppWindow* _tmp528_ = NULL;
 		const gchar* _tmp529_ = NULL;
@@ -8564,7 +8529,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp556_ = dialog_response;
 #line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp556_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID) {
-#line 8553 "Dialogs.c"
+#line 8518 "Dialogs.c"
 			GtkWindow* _tmp557_ = NULL;
 			ImportManifest* _tmp558_ = NULL;
 			gchar* _tmp559_ = NULL;
@@ -8581,7 +8546,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			import_ui_save_import_results (_tmp557_, _tmp560_);
 #line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp560_);
-#line 8570 "Dialogs.c"
+#line 8535 "Dialogs.c"
 		}
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dialog_parent);
@@ -8589,7 +8554,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_object_unref0 (ok_button);
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (save_results_button);
-#line 8578 "Dialogs.c"
+#line 8543 "Dialogs.c"
 	} else {
 		const gchar* _tmp561_ = NULL;
 		ImportUIQuestionParams* _tmp562_ = NULL;
@@ -8733,7 +8698,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		dialog_response = _tmp596_;
 #line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 8722 "Dialogs.c"
+#line 8687 "Dialogs.c"
 			gint _tmp597_ = 0;
 			GtkMessageDialog* _tmp598_ = NULL;
 			ImportManifest* _tmp599_ = NULL;
@@ -8747,7 +8712,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			if (!(_tmp597_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID)) {
 #line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 8736 "Dialogs.c"
+#line 8701 "Dialogs.c"
 			}
 #line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp598_ = dialog;
@@ -8767,7 +8732,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_tmp603_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp602_, gtk_dialog_get_type (), GtkDialog));
 #line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			dialog_response = _tmp603_;
-#line 8756 "Dialogs.c"
+#line 8721 "Dialogs.c"
 		}
 #line 902 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp604_ = dialog;
@@ -8781,7 +8746,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_object_unref0 (no_button);
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (save_results_button);
-#line 8770 "Dialogs.c"
+#line 8735 "Dialogs.c"
 	}
 #line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp606_ = dialog_response;
@@ -8793,7 +8758,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_g_free0 (message);
 #line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 8782 "Dialogs.c"
+#line 8747 "Dialogs.c"
 }
 
 
@@ -8809,41 +8774,41 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	gint _tmp3__length1 = 0;
 	guint8* _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 8826 "Dialogs.c"
+#line 8791 "Dialogs.c"
 	}
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 8832 "Dialogs.c"
+#line 8797 "Dialogs.c"
 }
 
 
@@ -8921,21 +8886,21 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 	_tmp14_ = dialog_result;
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 8910 "Dialogs.c"
+#line 8875 "Dialogs.c"
 		GFile* _tmp15_ = NULL;
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = chosen_file;
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp15_ != NULL;
-#line 8916 "Dialogs.c"
+#line 8881 "Dialogs.c"
 	} else {
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = FALSE;
-#line 8920 "Dialogs.c"
+#line 8885 "Dialogs.c"
 	}
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp13_) {
-#line 8924 "Dialogs.c"
+#line 8889 "Dialogs.c"
 		{
 			GFileOutputStream* outstream = NULL;
 			GFile* _tmp16_ = NULL;
@@ -8955,7 +8920,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			outstream = _tmp17_;
 #line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8944 "Dialogs.c"
+#line 8909 "Dialogs.c"
 				goto __catch421_g_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -8969,28 +8934,28 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21__length1 = _tmp20__length1;
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			g_output_stream_write (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, g_output_stream_get_type (), GOutputStream), _tmp21_, (gsize) _tmp21__length1, NULL, &_inner_error_);
+			g_output_stream_write (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, G_TYPE_OUTPUT_STREAM, GOutputStream), _tmp21_, (gsize) _tmp21__length1, NULL, &_inner_error_);
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
-#line 8963 "Dialogs.c"
+#line 8928 "Dialogs.c"
 				goto __catch421_g_error;
 			}
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = outstream;
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_output_stream_get_type (), GOutputStream), NULL, &_inner_error_);
+			g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, G_TYPE_OUTPUT_STREAM, GOutputStream), NULL, &_inner_error_);
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
-#line 8974 "Dialogs.c"
+#line 8939 "Dialogs.c"
 				goto __catch421_g_error;
 			}
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (outstream);
-#line 8979 "Dialogs.c"
+#line 8944 "Dialogs.c"
 		}
 		goto __finally421;
 		__catch421_g_error:
@@ -9021,7 +8986,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			_g_free0 (_tmp25_);
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_error_free0 (err);
-#line 9010 "Dialogs.c"
+#line 8975 "Dialogs.c"
 		}
 		__finally421:
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9036,14 +9001,14 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			g_clear_error (&_inner_error_);
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return;
-#line 9025 "Dialogs.c"
+#line 8990 "Dialogs.c"
 		}
 	}
 #line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chosen_file);
 #line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chooser_dialog);
-#line 9032 "Dialogs.c"
+#line 8997 "Dialogs.c"
 }
 
 
@@ -9052,7 +9017,7 @@ static gboolean _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog
 	result = text_entry_dialog_mediator_on_modify_validate ((TextEntryDialogMediator*) self, text);
 #line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9041 "Dialogs.c"
+#line 9006 "Dialogs.c"
 }
 
 
@@ -9121,7 +9086,7 @@ TextEntryDialogMediator* text_entry_dialog_mediator_construct (GType object_type
 	_g_object_unref0 (builder);
 #line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9110 "Dialogs.c"
+#line 9075 "Dialogs.c"
 }
 
 
@@ -9133,7 +9098,7 @@ static gboolean text_entry_dialog_mediator_real_on_modify_validate (TextEntryDia
 	result = TRUE;
 #line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9122 "Dialogs.c"
+#line 9087 "Dialogs.c"
 }
 
 
@@ -9142,7 +9107,7 @@ gboolean text_entry_dialog_mediator_on_modify_validate (TextEntryDialogMediator*
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE);
 #line 949 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text);
-#line 9131 "Dialogs.c"
+#line 9096 "Dialogs.c"
 }
 
 
@@ -9160,14 +9125,14 @@ gchar* _text_entry_dialog_mediator_execute (TextEntryDialogMediator* self) {
 	result = _tmp1_;
 #line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9149 "Dialogs.c"
+#line 9114 "Dialogs.c"
 }
 
 
 static void value_text_entry_dialog_mediator_init (GValue* value) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 9156 "Dialogs.c"
+#line 9121 "Dialogs.c"
 }
 
 
@@ -9176,7 +9141,7 @@ static void value_text_entry_dialog_mediator_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (value->data[0].v_pointer);
-#line 9165 "Dialogs.c"
+#line 9130 "Dialogs.c"
 	}
 }
 
@@ -9186,11 +9151,11 @@ static void value_text_entry_dialog_mediator_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = text_entry_dialog_mediator_ref (src_value->data[0].v_pointer);
-#line 9175 "Dialogs.c"
+#line 9140 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9179 "Dialogs.c"
+#line 9144 "Dialogs.c"
 	}
 }
 
@@ -9198,37 +9163,37 @@ static void value_text_entry_dialog_mediator_copy_value (const GValue* src_value
 static gpointer value_text_entry_dialog_mediator_peek_pointer (const GValue* value) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9187 "Dialogs.c"
+#line 9152 "Dialogs.c"
 }
 
 
 static gchar* value_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 9194 "Dialogs.c"
+#line 9159 "Dialogs.c"
 		TextEntryDialogMediator* object;
 		object = collect_values[0].v_pointer;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9201 "Dialogs.c"
+#line 9166 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9205 "Dialogs.c"
+#line 9170 "Dialogs.c"
 		}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = text_entry_dialog_mediator_ref (object);
-#line 9209 "Dialogs.c"
+#line 9174 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9213 "Dialogs.c"
+#line 9178 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9217 "Dialogs.c"
+#line 9182 "Dialogs.c"
 }
 
 
@@ -9239,25 +9204,25 @@ static gchar* value_text_entry_dialog_mediator_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9228 "Dialogs.c"
+#line 9193 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 9234 "Dialogs.c"
+#line 9199 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9238 "Dialogs.c"
+#line 9203 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9242 "Dialogs.c"
+#line 9207 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9246 "Dialogs.c"
+#line 9211 "Dialogs.c"
 }
 
 
@@ -9271,7 +9236,7 @@ GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 9260 "Dialogs.c"
+#line 9225 "Dialogs.c"
 }
 
 
@@ -9280,7 +9245,7 @@ gpointer value_get_text_entry_dialog_mediator (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9269 "Dialogs.c"
+#line 9234 "Dialogs.c"
 }
 
 
@@ -9300,17 +9265,17 @@ void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9289 "Dialogs.c"
+#line 9254 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9293 "Dialogs.c"
+#line 9258 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (old);
-#line 9299 "Dialogs.c"
+#line 9264 "Dialogs.c"
 	}
 }
 
@@ -9329,17 +9294,17 @@ void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 9318 "Dialogs.c"
+#line 9283 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9322 "Dialogs.c"
+#line 9287 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (old);
-#line 9328 "Dialogs.c"
+#line 9293 "Dialogs.c"
 	}
 }
 
@@ -9353,7 +9318,7 @@ static void text_entry_dialog_mediator_class_init (TextEntryDialogMediatorClass
 	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;
-#line 9342 "Dialogs.c"
+#line 9307 "Dialogs.c"
 }
 
 
@@ -9362,7 +9327,7 @@ static void text_entry_dialog_mediator_instance_init (TextEntryDialogMediator *
 	self->priv = TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 9351 "Dialogs.c"
+#line 9316 "Dialogs.c"
 }
 
 
@@ -9374,7 +9339,7 @@ static void text_entry_dialog_mediator_finalize (TextEntryDialogMediator* obj) {
 	g_signal_handlers_destroy (self);
 #line 938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 9363 "Dialogs.c"
+#line 9328 "Dialogs.c"
 }
 
 
@@ -9399,7 +9364,7 @@ gpointer text_entry_dialog_mediator_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 9388 "Dialogs.c"
+#line 9353 "Dialogs.c"
 }
 
 
@@ -9412,7 +9377,7 @@ void text_entry_dialog_mediator_unref (gpointer instance) {
 		TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9401 "Dialogs.c"
+#line 9366 "Dialogs.c"
 	}
 }
 
@@ -9422,7 +9387,7 @@ static gboolean _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_
 	result = multi_text_entry_dialog_mediator_on_modify_validate ((MultiTextEntryDialogMediator*) self, text);
 #line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9411 "Dialogs.c"
+#line 9376 "Dialogs.c"
 }
 
 
@@ -9483,7 +9448,7 @@ MultiTextEntryDialogMediator* multi_text_entry_dialog_mediator_construct (GType
 	_g_object_unref0 (builder);
 #line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9472 "Dialogs.c"
+#line 9437 "Dialogs.c"
 }
 
 
@@ -9495,7 +9460,7 @@ static gboolean multi_text_entry_dialog_mediator_real_on_modify_validate (MultiT
 	result = TRUE;
 #line 970 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9484 "Dialogs.c"
+#line 9449 "Dialogs.c"
 }
 
 
@@ -9504,7 +9469,7 @@ gboolean multi_text_entry_dialog_mediator_on_modify_validate (MultiTextEntryDial
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE);
 #line 969 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text);
-#line 9493 "Dialogs.c"
+#line 9458 "Dialogs.c"
 }
 
 
@@ -9522,14 +9487,14 @@ gchar* _multi_text_entry_dialog_mediator_execute (MultiTextEntryDialogMediator*
 	result = _tmp1_;
 #line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9511 "Dialogs.c"
+#line 9476 "Dialogs.c"
 }
 
 
 static void value_multi_text_entry_dialog_mediator_init (GValue* value) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 9518 "Dialogs.c"
+#line 9483 "Dialogs.c"
 }
 
 
@@ -9538,7 +9503,7 @@ static void value_multi_text_entry_dialog_mediator_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (value->data[0].v_pointer);
-#line 9527 "Dialogs.c"
+#line 9492 "Dialogs.c"
 	}
 }
 
@@ -9548,11 +9513,11 @@ static void value_multi_text_entry_dialog_mediator_copy_value (const GValue* src
 	if (src_value->data[0].v_pointer) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (src_value->data[0].v_pointer);
-#line 9537 "Dialogs.c"
+#line 9502 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9541 "Dialogs.c"
+#line 9506 "Dialogs.c"
 	}
 }
 
@@ -9560,37 +9525,37 @@ static void value_multi_text_entry_dialog_mediator_copy_value (const GValue* src
 static gpointer value_multi_text_entry_dialog_mediator_peek_pointer (const GValue* value) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9549 "Dialogs.c"
+#line 9514 "Dialogs.c"
 }
 
 
 static gchar* value_multi_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 9556 "Dialogs.c"
+#line 9521 "Dialogs.c"
 		MultiTextEntryDialogMediator* object;
 		object = collect_values[0].v_pointer;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9563 "Dialogs.c"
+#line 9528 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9567 "Dialogs.c"
+#line 9532 "Dialogs.c"
 		}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (object);
-#line 9571 "Dialogs.c"
+#line 9536 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9575 "Dialogs.c"
+#line 9540 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9579 "Dialogs.c"
+#line 9544 "Dialogs.c"
 }
 
 
@@ -9601,25 +9566,25 @@ static gchar* value_multi_text_entry_dialog_mediator_lcopy_value (const GValue*
 	if (!object_p) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9590 "Dialogs.c"
+#line 9555 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 9596 "Dialogs.c"
+#line 9561 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9600 "Dialogs.c"
+#line 9565 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9604 "Dialogs.c"
+#line 9569 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9608 "Dialogs.c"
+#line 9573 "Dialogs.c"
 }
 
 
@@ -9633,7 +9598,7 @@ GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 9622 "Dialogs.c"
+#line 9587 "Dialogs.c"
 }
 
 
@@ -9642,7 +9607,7 @@ gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9631 "Dialogs.c"
+#line 9596 "Dialogs.c"
 }
 
 
@@ -9662,17 +9627,17 @@ void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_objec
 		value->data[0].v_pointer = v_object;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9651 "Dialogs.c"
+#line 9616 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9655 "Dialogs.c"
+#line 9620 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (old);
-#line 9661 "Dialogs.c"
+#line 9626 "Dialogs.c"
 	}
 }
 
@@ -9691,17 +9656,17 @@ void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_obje
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 9680 "Dialogs.c"
+#line 9645 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9684 "Dialogs.c"
+#line 9649 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (old);
-#line 9690 "Dialogs.c"
+#line 9655 "Dialogs.c"
 	}
 }
 
@@ -9715,7 +9680,7 @@ static void multi_text_entry_dialog_mediator_class_init (MultiTextEntryDialogMed
 	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;
-#line 9704 "Dialogs.c"
+#line 9669 "Dialogs.c"
 }
 
 
@@ -9724,7 +9689,7 @@ static void multi_text_entry_dialog_mediator_instance_init (MultiTextEntryDialog
 	self->priv = MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 9713 "Dialogs.c"
+#line 9678 "Dialogs.c"
 }
 
 
@@ -9736,7 +9701,7 @@ static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMedia
 	g_signal_handlers_destroy (self);
 #line 959 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 9725 "Dialogs.c"
+#line 9690 "Dialogs.c"
 }
 
 
@@ -9761,7 +9726,7 @@ gpointer multi_text_entry_dialog_mediator_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 9750 "Dialogs.c"
+#line 9715 "Dialogs.c"
 }
 
 
@@ -9774,7 +9739,7 @@ void multi_text_entry_dialog_mediator_unref (gpointer instance) {
 		MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9763 "Dialogs.c"
+#line 9728 "Dialogs.c"
 	}
 }
 
@@ -9792,7 +9757,7 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 	_tmp0_ = should_escape;
 #line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 9781 "Dialogs.c"
+#line 9746 "Dialogs.c"
 		const gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -9825,7 +9790,7 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 		result = _tmp8_;
 #line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 9814 "Dialogs.c"
+#line 9779 "Dialogs.c"
 	}
 #line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = primary_text;
@@ -9845,7 +9810,7 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 	result = _tmp14_;
 #line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9834 "Dialogs.c"
+#line 9799 "Dialogs.c"
 }
 
 
@@ -9854,7 +9819,7 @@ static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_fu
 	result = entry_multi_completion_match_func ((EntryMultiCompletion*) self, completion, key, iter);
 #line 1003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9843 "Dialogs.c"
+#line 9808 "Dialogs.c"
 }
 
 
@@ -9877,7 +9842,7 @@ EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCo
 	if (_tmp1_ == NULL) {
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 9866 "Dialogs.c"
+#line 9831 "Dialogs.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
@@ -9890,7 +9855,7 @@ EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCo
 		_tmp4_ = _tmp3_;
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_ == 1;
-#line 9879 "Dialogs.c"
+#line 9844 "Dialogs.c"
 	}
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0_, "delimiter == null || delimiter.length == 1");
@@ -9918,14 +9883,14 @@ EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCo
 	gtk_entry_completion_set_match_func (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), _entry_multi_completion_match_func_gtk_entry_completion_match_func, g_object_ref (self), g_object_unref);
 #line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9907 "Dialogs.c"
+#line 9872 "Dialogs.c"
 }
 
 
 EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter) {
 #line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return entry_multi_completion_construct (TYPE_ENTRY_MULTI_COMPLETION, completion_list, delimiter);
-#line 9914 "Dialogs.c"
+#line 9879 "Dialogs.c"
 }
 
 
@@ -9951,7 +9916,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 	completion_iter = _tmp2_;
 #line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	while (TRUE) {
-#line 9940 "Dialogs.c"
+#line 9905 "Dialogs.c"
 		GeeIterator* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
 		GtkListStore* _tmp5_ = NULL;
@@ -9969,7 +9934,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 		if (!_tmp4_) {
 #line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			break;
-#line 9958 "Dialogs.c"
+#line 9923 "Dialogs.c"
 		}
 #line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = completion_store;
@@ -9991,7 +9956,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 		gtk_list_store_set (_tmp7_, &_tmp8_, 0, _tmp11_, -1, -1);
 #line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp11_);
-#line 9980 "Dialogs.c"
+#line 9945 "Dialogs.c"
 	}
 #line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = completion_store;
@@ -9999,7 +9964,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 	_g_object_unref0 (completion_iter);
 #line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9988 "Dialogs.c"
+#line 9953 "Dialogs.c"
 }
 
 
@@ -10008,21 +9973,21 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 10011 "Dialogs.c"
+#line 9976 "Dialogs.c"
 }
 
 
@@ -10030,19 +9995,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 10031 "Dialogs.c"
+#line 9996 "Dialogs.c"
 }
 
 
@@ -10053,35 +10018,35 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 10056 "Dialogs.c"
+#line 10021 "Dialogs.c"
 		gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
-#line 10064 "Dialogs.c"
+#line 10029 "Dialogs.c"
 	} else {
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
-#line 10070 "Dialogs.c"
+#line 10035 "Dialogs.c"
 	}
 }
 
@@ -10149,7 +10114,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 	_tmp11_ = self->priv->delimiter;
 #line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_ == NULL) {
-#line 10138 "Dialogs.c"
+#line 10103 "Dialogs.c"
 		const gchar* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
@@ -10180,7 +10145,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 		_g_object_unref0 (model);
 #line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10169 "Dialogs.c"
+#line 10134 "Dialogs.c"
 	} else {
 		const gchar* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
@@ -10209,7 +10174,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 		_tmp20_ = string_contains (_tmp18_, _tmp19_);
 #line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp20_) {
-#line 10198 "Dialogs.c"
+#line 10163 "Dialogs.c"
 			gint offset = 0;
 			const gchar* _tmp21_ = NULL;
 			const gchar* _tmp22_ = NULL;
@@ -10258,7 +10223,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 				_g_object_unref0 (model);
 #line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 10247 "Dialogs.c"
+#line 10212 "Dialogs.c"
 			}
 		}
 #line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10297,7 +10262,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 			_g_object_unref0 (model);
 #line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 10286 "Dialogs.c"
+#line 10251 "Dialogs.c"
 		}
 #line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp40_ = possible_match;
@@ -10325,7 +10290,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 		_g_object_unref0 (model);
 #line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10314 "Dialogs.c"
+#line 10279 "Dialogs.c"
 	}
 #line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (normed_key);
@@ -10333,7 +10298,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 	_g_free0 (possible_match);
 #line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (model);
-#line 10322 "Dialogs.c"
+#line 10287 "Dialogs.c"
 }
 
 
@@ -10344,39 +10309,39 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 10345 "Dialogs.c"
+#line 10310 "Dialogs.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
-#line 10353 "Dialogs.c"
+#line 10318 "Dialogs.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
-#line 10365 "Dialogs.c"
+#line 10330 "Dialogs.c"
 	}
 }
 
@@ -10394,114 +10359,114 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 10389 "Dialogs.c"
+#line 10354 "Dialogs.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 10395 "Dialogs.c"
+#line 10360 "Dialogs.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 10399 "Dialogs.c"
+#line 10364 "Dialogs.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 10403 "Dialogs.c"
+#line 10368 "Dialogs.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 10415 "Dialogs.c"
+#line 10380 "Dialogs.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 10425 "Dialogs.c"
+#line 10390 "Dialogs.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 10431 "Dialogs.c"
+#line 10396 "Dialogs.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 10445 "Dialogs.c"
+#line 10410 "Dialogs.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 10455 "Dialogs.c"
+#line 10420 "Dialogs.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 10461 "Dialogs.c"
+#line 10426 "Dialogs.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 10470 "Dialogs.c"
+#line 10435 "Dialogs.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 10490 "Dialogs.c"
+#line 10455 "Dialogs.c"
 }
 
 
@@ -10571,7 +10536,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	_tmp9_ = _tmp8_;
 #line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ > 0) {
-#line 10560 "Dialogs.c"
+#line 10525 "Dialogs.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
@@ -10583,7 +10548,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 		_tmp12_ = string_contains (_tmp10_, _tmp11_);
 #line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp12_) {
-#line 10572 "Dialogs.c"
+#line 10537 "Dialogs.c"
 			const gchar* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
 			const gchar* _tmp15_ = NULL;
@@ -10600,11 +10565,11 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 			if (g_strcmp0 (_tmp14_, " ") != 0) {
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = " ";
-#line 10589 "Dialogs.c"
+#line 10554 "Dialogs.c"
 			} else {
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = "";
-#line 10593 "Dialogs.c"
+#line 10558 "Dialogs.c"
 			}
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = old_text;
@@ -10628,7 +10593,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 			old_text = _tmp22_;
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp21_);
-#line 10617 "Dialogs.c"
+#line 10582 "Dialogs.c"
 		} else {
 			gchar* _tmp23_ = NULL;
 #line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10637,7 +10602,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 			_g_free0 (old_text);
 #line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			old_text = _tmp23_;
-#line 10626 "Dialogs.c"
+#line 10591 "Dialogs.c"
 		}
 	}
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10646,11 +10611,11 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	if (g_strcmp0 (_tmp25_, " ") != 0) {
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = " ";
-#line 10635 "Dialogs.c"
+#line 10600 "Dialogs.c"
 	} else {
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = "";
-#line 10639 "Dialogs.c"
+#line 10604 "Dialogs.c"
 	}
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = old_text;
@@ -10700,7 +10665,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	_g_free0 (match);
 #line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 10689 "Dialogs.c"
+#line 10654 "Dialogs.c"
 }
 
 
@@ -10738,7 +10703,7 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 	_tmp5__length1 = split_length1;
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 10727 "Dialogs.c"
+#line 10692 "Dialogs.c"
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
 		const gchar* _tmp7_ = NULL;
@@ -10750,15 +10715,15 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 		_tmp7_ = _tmp6_[0];
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp7_ != NULL;
-#line 10739 "Dialogs.c"
+#line 10704 "Dialogs.c"
 	} else {
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = FALSE;
-#line 10743 "Dialogs.c"
+#line 10708 "Dialogs.c"
 	}
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 10747 "Dialogs.c"
+#line 10712 "Dialogs.c"
 		gchar** _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
 		gchar** _tmp9_ = NULL;
@@ -10783,7 +10748,7 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
 #line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10772 "Dialogs.c"
+#line 10737 "Dialogs.c"
 	} else {
 		gchar* _tmp12_ = NULL;
 #line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10794,11 +10759,11 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
 #line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10783 "Dialogs.c"
+#line 10748 "Dialogs.c"
 	}
 #line 1072 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
-#line 10787 "Dialogs.c"
+#line 10752 "Dialogs.c"
 }
 
 
@@ -10811,14 +10776,14 @@ static void entry_multi_completion_class_init (EntryMultiCompletionClass * klass
 	((GtkEntryCompletionClass *) klass)->match_selected = 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 10800 "Dialogs.c"
+#line 10765 "Dialogs.c"
 }
 
 
 static void entry_multi_completion_instance_init (EntryMultiCompletion * self) {
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = ENTRY_MULTI_COMPLETION_GET_PRIVATE (self);
-#line 10807 "Dialogs.c"
+#line 10772 "Dialogs.c"
 }
 
 
@@ -10830,7 +10795,7 @@ static void entry_multi_completion_finalize (GObject* obj) {
 	_g_free0 (self->priv->delimiter);
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (entry_multi_completion_parent_class)->finalize (obj);
-#line 10819 "Dialogs.c"
+#line 10784 "Dialogs.c"
 }
 
 
@@ -10846,515 +10811,95 @@ GType entry_multi_completion_get_type (void) {
 }
 
 
-static void _set_background_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 1102 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	set_background_dialog_on_checkbox_clicked ((SetBackgroundDialog*) self);
-#line 10838 "Dialogs.c"
-}
-
-
-SetBackgroundDialog* set_background_dialog_construct (GType object_type, GtkBuilder* builder) {
-	SetBackgroundDialog* self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkDialog* _tmp2_ = NULL;
-	GtkDialog* _tmp3_ = NULL;
-	GtkDialog* _tmp4_ = NULL;
-	AppWindow* _tmp5_ = NULL;
-	AppWindow* _tmp6_ = NULL;
-	GdkWindow* _tmp7_ = NULL;
-	GtkDialog* _tmp8_ = NULL;
-	AppWindow* _tmp9_ = NULL;
-	AppWindow* _tmp10_ = NULL;
-	GtkDialog* _tmp11_ = NULL;
-	GtkBuilder* _tmp12_ = NULL;
-	GObject* _tmp13_ = NULL;
-	GtkCheckButton* _tmp14_ = NULL;
-	GtkCheckButton* _tmp15_ = NULL;
-	gboolean _tmp16_ = FALSE;
-	GtkCheckButton* _tmp17_ = NULL;
-	GtkBuilder* _tmp18_ = NULL;
-	GObject* _tmp19_ = NULL;
-	GtkCheckButton* _tmp20_ = NULL;
-	GtkCheckButton* _tmp21_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	GtkCheckButton* _tmp23_ = NULL;
-	GtkBuilder* _tmp24_ = NULL;
-	GObject* _tmp25_ = NULL;
-	GtkButton* _tmp26_ = NULL;
+SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type) {
+	SetBackgroundPhotoDialog * self = NULL;
+	gboolean use_header = FALSE;
+	GtkSettings* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gboolean _tmp2_ = FALSE;
+	AppWindow* _tmp3_ = NULL;
+	AppWindow* _tmp4_ = NULL;
 #line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
+	_tmp0_ = gtk_settings_get_default ();
 #line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (SetBackgroundDialog*) g_type_create_instance (object_type);
-#line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = builder;
+	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
+#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = use_header;
+#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	if (_tmp2_) {
+#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp1_ = 1;
+#line 10818 "Dialogs.c"
+	} else {
+#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp1_ = 0;
+#line 10822 "Dialogs.c"
+	}
+#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self = (SetBackgroundPhotoDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
 #line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_builder_get_object (_tmp0_, "dialog1");
+	_tmp3_ = app_window_get_instance ();
 #line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_dialog_get_type ()) ? ((GtkDialog*) _tmp1_) : NULL);
+	_tmp4_ = _tmp3_;
 #line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->dialog);
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow));
 #line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->dialog = _tmp2_;
-#line 1095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = self->dialog;
-#line 1095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = self->dialog;
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = app_window_get_instance ();
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = _tmp5_;
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp7_);
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp6_);
-#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = self->dialog;
-#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = app_window_get_instance ();
-#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = _tmp9_;
-#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow));
-#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp10_);
-#line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = self->dialog;
+	_g_object_unref0 (_tmp4_);
+#line 1090 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	return self;
+#line 10836 "Dialogs.c"
+}
+
+
+SetBackgroundPhotoDialog* set_background_photo_dialog_new (void) {
+#line 1090 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	return set_background_photo_dialog_construct (TYPE_SET_BACKGROUND_PHOTO_DIALOG);
+#line 10843 "Dialogs.c"
+}
+
+
+static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self) {
+	gboolean _tmp0_ = FALSE;
+	GtkCheckButton* _tmp1_ = NULL;
+	gboolean _tmp2_ = FALSE;
+	gboolean _tmp3_ = FALSE;
 #line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_set_default_response (_tmp11_, (gint) GTK_RESPONSE_OK);
+	g_return_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self));
 #line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = builder;
+	_tmp1_ = self->priv->desktop_background_checkbox;
 #line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = gtk_builder_get_object (_tmp12_, "desktop_background_checkbox");
+	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp13_) : NULL);
+	_tmp3_ = _tmp2_;
 #line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->desktop_background_button);
+	if (_tmp3_) {
 #line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->desktop_background_button = _tmp14_;
+		_tmp0_ = TRUE;
+#line 10864 "Dialogs.c"
+	} else {
+		GtkCheckButton* _tmp4_ = NULL;
+		gboolean _tmp5_ = FALSE;
+		gboolean _tmp6_ = FALSE;
 #line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = self->desktop_background_button;
+		_tmp4_ = self->priv->screensaver_checkbox;
 #line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = self->desktop;
+		_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp16_);
-#line 1102 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = self->desktop_background_button;
-#line 1102 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _set_background_dialog_on_checkbox_clicked_gtk_toggle_button_toggled, self);
-#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = builder;
-#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = gtk_builder_get_object (_tmp18_, "screensaver_checkbox");
-#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp19_) : NULL);
-#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->screensaver_button);
-#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->screensaver_button = _tmp20_;
-#line 1104 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = self->screensaver_button;
-#line 1104 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = self->screensaver;
-#line 1104 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp22_);
-#line 1105 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = self->screensaver_button;
-#line 1105 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _set_background_dialog_on_checkbox_clicked_gtk_toggle_button_toggled, self);
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = builder;
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = gtk_builder_get_object (_tmp24_, "ok_button");
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL);
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->ok_button);
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->ok_button = _tmp26_;
-#line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 10967 "Dialogs.c"
-}
-
-
-void set_background_dialog_on_checkbox_clicked (SetBackgroundDialog* self) {
-	GtkCheckButton* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	GtkCheckButton* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_SET_BACKGROUND_DIALOG (self));
-#line 1111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->desktop_background_button;
-#line 1111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _tmp1_;
-#line 1111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->desktop = _tmp2_;
-#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = self->screensaver_button;
-#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
-#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->screensaver = _tmp5_;
-#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = self->desktop;
-#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!_tmp7_) {
-#line 11002 "Dialogs.c"
-		gboolean _tmp8_ = FALSE;
-#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = self->screensaver;
-#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = !_tmp8_;
-#line 11008 "Dialogs.c"
-	} else {
-#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = FALSE;
-#line 11012 "Dialogs.c"
-	}
-#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp6_) {
-#line 11016 "Dialogs.c"
-		GtkButton* _tmp9_ = NULL;
-#line 1115 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = self->ok_button;
-#line 1115 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 11022 "Dialogs.c"
-	} else {
-		GtkButton* _tmp10_ = NULL;
-#line 1117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = self->ok_button;
-#line 1117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 11029 "Dialogs.c"
-	}
-}
-
-
-gboolean set_background_dialog_execute_base (SetBackgroundDialog* self) {
-	gboolean result = FALSE;
-	GtkDialog* _tmp0_ = NULL;
-	gboolean _result_ = FALSE;
-	GtkDialog* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	GtkDialog* _tmp3_ = NULL;
-#line 1121 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_SET_BACKGROUND_DIALOG (self), FALSE);
-#line 1122 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->dialog;
-#line 1122 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1123 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->dialog;
-#line 1123 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_dialog_run (_tmp1_);
-#line 1123 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = _tmp2_ == ((gint) GTK_RESPONSE_OK);
-#line 1124 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = self->dialog;
-#line 1124 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 1126 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _result_;
-#line 1126 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 11061 "Dialogs.c"
-}
-
-
-static void value_set_background_dialog_init (GValue* value) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	value->data[0].v_pointer = NULL;
-#line 11068 "Dialogs.c"
-}
-
-
-static void value_set_background_dialog_free_value (GValue* value) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (value->data[0].v_pointer) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		set_background_dialog_unref (value->data[0].v_pointer);
-#line 11077 "Dialogs.c"
-	}
-}
-
-
-static void value_set_background_dialog_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (src_value->data[0].v_pointer) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dest_value->data[0].v_pointer = set_background_dialog_ref (src_value->data[0].v_pointer);
-#line 11087 "Dialogs.c"
-	} else {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 11091 "Dialogs.c"
-	}
-}
-
-
-static gpointer value_set_background_dialog_peek_pointer (const GValue* value) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return value->data[0].v_pointer;
-#line 11099 "Dialogs.c"
-}
-
-
-static gchar* value_set_background_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (collect_values[0].v_pointer) {
-#line 11106 "Dialogs.c"
-		SetBackgroundDialog* object;
-		object = collect_values[0].v_pointer;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11113 "Dialogs.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1083 "/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 11117 "Dialogs.c"
-		}
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = set_background_dialog_ref (object);
-#line 11121 "Dialogs.c"
-	} else {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = NULL;
-#line 11125 "Dialogs.c"
-	}
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return NULL;
-#line 11129 "Dialogs.c"
-}
-
-
-static gchar* value_set_background_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SetBackgroundDialog** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!object_p) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11140 "Dialogs.c"
-	}
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!value->data[0].v_pointer) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*object_p = NULL;
-#line 11146 "Dialogs.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*object_p = value->data[0].v_pointer;
-#line 11150 "Dialogs.c"
-	} else {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*object_p = set_background_dialog_ref (value->data[0].v_pointer);
-#line 11154 "Dialogs.c"
-	}
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return NULL;
-#line 11158 "Dialogs.c"
-}
-
-
-GParamSpec* param_spec_set_background_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	ParamSpecSetBackgroundDialog* spec;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SET_BACKGROUND_DIALOG), NULL);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return G_PARAM_SPEC (spec);
-#line 11172 "Dialogs.c"
-}
-
-
-gpointer value_get_set_background_dialog (const GValue* value) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SET_BACKGROUND_DIALOG), NULL);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return value->data[0].v_pointer;
-#line 11181 "Dialogs.c"
-}
-
-
-void value_set_set_background_dialog (GValue* value, gpointer v_object) {
-	SetBackgroundDialog* old;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SET_BACKGROUND_DIALOG));
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	old = value->data[0].v_pointer;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (v_object) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SET_BACKGROUND_DIALOG));
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = v_object;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		set_background_dialog_ref (value->data[0].v_pointer);
-#line 11201 "Dialogs.c"
-	} else {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = NULL;
-#line 11205 "Dialogs.c"
-	}
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (old) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		set_background_dialog_unref (old);
-#line 11211 "Dialogs.c"
-	}
-}
-
-
-void value_take_set_background_dialog (GValue* value, gpointer v_object) {
-	SetBackgroundDialog* old;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SET_BACKGROUND_DIALOG));
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	old = value->data[0].v_pointer;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (v_object) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SET_BACKGROUND_DIALOG));
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = v_object;
-#line 11230 "Dialogs.c"
-	} else {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = NULL;
-#line 11234 "Dialogs.c"
-	}
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (old) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		set_background_dialog_unref (old);
-#line 11240 "Dialogs.c"
+		_tmp6_ = _tmp5_;
+#line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp0_ = _tmp6_;
+#line 10877 "Dialogs.c"
 	}
+#line 1099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
+#line 10881 "Dialogs.c"
 }
 
 
-static void set_background_dialog_class_init (SetBackgroundDialogClass * klass) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	set_background_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((SetBackgroundDialogClass *) klass)->finalize = set_background_dialog_finalize;
-#line 11250 "Dialogs.c"
-}
-
-
-static void set_background_dialog_instance_init (SetBackgroundDialog * self) {
-#line 1089 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->desktop = TRUE;
-#line 1090 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->screensaver = FALSE;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->ref_count = 1;
-#line 11261 "Dialogs.c"
-}
-
-
-static void set_background_dialog_finalize (SetBackgroundDialog* obj) {
-	SetBackgroundDialog * self;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_handlers_destroy (self);
+static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
 #line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->dialog);
-#line 1085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->desktop_background_button);
-#line 1086 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->screensaver_button);
-#line 1087 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->ok_button);
-#line 11279 "Dialogs.c"
-}
-
-
-GType set_background_dialog_get_type (void) {
-	static volatile gsize set_background_dialog_type_id__volatile = 0;
-	if (g_once_init_enter (&set_background_dialog_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_set_background_dialog_init, value_set_background_dialog_free_value, value_set_background_dialog_copy_value, value_set_background_dialog_peek_pointer, "p", value_set_background_dialog_collect_value, "p", value_set_background_dialog_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundDialog), 0, (GInstanceInitFunc) set_background_dialog_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType set_background_dialog_type_id;
-		set_background_dialog_type_id = g_type_register_fundamental (g_type_fundamental_next (), "SetBackgroundDialog", &g_define_type_info, &g_define_type_fundamental_info, G_TYPE_FLAG_ABSTRACT);
-		g_once_init_leave (&set_background_dialog_type_id__volatile, set_background_dialog_type_id);
-	}
-	return set_background_dialog_type_id__volatile;
-}
-
-
-gpointer set_background_dialog_ref (gpointer instance) {
-	SetBackgroundDialog* self;
-	self = instance;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return instance;
-#line 11304 "Dialogs.c"
-}
-
-
-void set_background_dialog_unref (gpointer instance) {
-	SetBackgroundDialog* self;
-	self = instance;
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		SET_BACKGROUND_DIALOG_GET_CLASS (self)->finalize (self);
-#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 11317 "Dialogs.c"
-	}
-}
-
-
-SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type) {
-	SetBackgroundPhotoDialog* self = NULL;
-	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = app_window_create_builder ("set_background_dialog.ui", self);
-#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	builder = _tmp0_;
-#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (SetBackgroundPhotoDialog*) set_background_dialog_construct (object_type, builder);
-#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (builder);
-#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 11336 "Dialogs.c"
-}
-
-
-SetBackgroundPhotoDialog* set_background_photo_dialog_new (void) {
-#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return set_background_photo_dialog_construct (TYPE_SET_BACKGROUND_PHOTO_DIALOG);
-#line 11343 "Dialogs.c"
+	set_background_photo_dialog_on_checkbox_clicked ((SetBackgroundPhotoDialog*) self);
+#line 10888 "Dialogs.c"
 }
 
 
@@ -11363,51 +10908,103 @@ gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gb
 	gboolean _vala_screensaver = FALSE;
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gint _tmp0_ = 0;
+	GtkCheckButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gboolean _tmp3_ = FALSE;
+	GtkCheckButton* _tmp4_ = NULL;
+	gboolean _tmp5_ = FALSE;
+	gboolean _tmp6_ = FALSE;
+#line 1104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self), FALSE);
-#line 1138 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = set_background_dialog_execute_base (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog));
-#line 1138 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = _tmp0_;
-#line 1140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog)->desktop;
-#line 1140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_desktop_background = _tmp1_;
-#line 1141 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog)->screensaver;
-#line 1141 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_screensaver = _tmp2_;
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1106 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 1106 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_result_ = _tmp0_ == ((gint) GTK_RESPONSE_OK);
+#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp1_ = self->priv->desktop_background_checkbox;
+#line 1109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp3_ = _tmp2_;
+#line 1109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_vala_desktop_background = _tmp3_;
+#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp4_ = self->priv->screensaver_checkbox;
+#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp6_ = _tmp5_;
+#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_vala_screensaver = _tmp6_;
+#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (desktop_background) {
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*desktop_background = _vala_desktop_background;
-#line 11375 "Dialogs.c"
+#line 10938 "Dialogs.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (screensaver) {
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*screensaver = _vala_screensaver;
-#line 11381 "Dialogs.c"
+#line 10944 "Dialogs.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11385 "Dialogs.c"
+#line 10948 "Dialogs.c"
 }
 
 
 static void set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClass * klass) {
-#line 1130 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gint SetBackgroundPhotoDialog_private_offset;
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_photo_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 11392 "Dialogs.c"
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_type_class_add_private (klass, sizeof (SetBackgroundPhotoDialogPrivate));
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	G_OBJECT_CLASS (klass)->finalize = set_background_photo_dialog_finalize;
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	SetBackgroundPhotoDialog_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/set_background_dialog.ui");
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "desktop_background_checkbox", FALSE, SetBackgroundPhotoDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundPhotoDialogPrivate, desktop_background_checkbox));
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "screensaver_checkbox", FALSE, SetBackgroundPhotoDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundPhotoDialogPrivate, screensaver_checkbox));
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled));
+#line 10970 "Dialogs.c"
 }
 
 
 static void set_background_photo_dialog_instance_init (SetBackgroundPhotoDialog * self) {
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv = SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE (self);
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 10979 "Dialogs.c"
+}
+
+
+static void set_background_photo_dialog_finalize (GObject* obj) {
+	SetBackgroundPhotoDialog * self;
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog);
+#line 1086 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->desktop_background_checkbox);
+#line 1088 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->screensaver_checkbox);
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	G_OBJECT_CLASS (set_background_photo_dialog_parent_class)->finalize (obj);
+#line 10993 "Dialogs.c"
 }
 
 
@@ -11416,78 +11013,112 @@ GType set_background_photo_dialog_get_type (void) {
 	if (g_once_init_enter (&set_background_photo_dialog_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundPhotoDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_photo_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundPhotoDialog), 0, (GInstanceInitFunc) set_background_photo_dialog_instance_init, NULL };
 		GType set_background_photo_dialog_type_id;
-		set_background_photo_dialog_type_id = g_type_register_static (TYPE_SET_BACKGROUND_DIALOG, "SetBackgroundPhotoDialog", &g_define_type_info, 0);
+		set_background_photo_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "SetBackgroundPhotoDialog", &g_define_type_info, 0);
 		g_once_init_leave (&set_background_photo_dialog_type_id__volatile, set_background_photo_dialog_type_id);
 	}
 	return set_background_photo_dialog_type_id__volatile;
 }
 
 
-static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	set_background_slideshow_dialog_on_delay_scale_value_changed ((SetBackgroundSlideshowDialog*) self);
-#line 11415 "Dialogs.c"
-}
-
-
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type) {
-	SetBackgroundSlideshowDialog* self = NULL;
-	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkLabel* _tmp2_ = NULL;
-	GObject* _tmp3_ = NULL;
-	GtkScale* _tmp4_ = NULL;
-	GtkScale* _tmp5_ = NULL;
-	GtkScale* _tmp6_ = NULL;
-	GtkAdjustment* _tmp7_ = NULL;
-	GtkAdjustment* _tmp8_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = app_window_create_builder ("set_background_slideshow_dialog.ui", self);
-#line 1153 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	builder = _tmp0_;
-#line 1154 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (SetBackgroundSlideshowDialog*) set_background_dialog_construct (object_type, builder);
-#line 1156 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_builder_get_object (builder, "delay_value_label");
-#line 1156 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp1_) : NULL);
-#line 1156 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->delay_value_label);
-#line 1156 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->delay_value_label = _tmp2_;
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = gtk_builder_get_object (builder, "delay_scale");
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp3_) : NULL);
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->delay_scale);
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->delay_scale = _tmp4_;
-#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = self->priv->delay_scale;
-#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed, self);
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = self->priv->delay_scale;
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = gtk_range_get_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange));
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = _tmp7_;
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_adjustment_set_value (_tmp8_, (gdouble) 50);
-#line 1152 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (builder);
-#line 1152 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	SetBackgroundSlideshowDialog * self = NULL;
+	gboolean use_header = FALSE;
+	GtkSettings* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gboolean _tmp2_ = FALSE;
+	AppWindow* _tmp3_ = NULL;
+	AppWindow* _tmp4_ = NULL;
+#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp0_ = gtk_settings_get_default ();
+#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
+#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = use_header;
+#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	if (_tmp2_) {
+#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp1_ = 1;
+#line 11027 "Dialogs.c"
+	} else {
+#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp1_ = 0;
+#line 11031 "Dialogs.c"
+	}
+#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self = (SetBackgroundSlideshowDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
+#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp3_ = app_window_get_instance ();
+#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp4_ = _tmp3_;
+#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow));
+#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (_tmp4_);
+#line 1130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11469 "Dialogs.c"
+#line 11045 "Dialogs.c"
 }
 
 
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void) {
-#line 1152 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return set_background_slideshow_dialog_construct (TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG);
-#line 11476 "Dialogs.c"
+#line 11052 "Dialogs.c"
+}
+
+
+static void set_background_slideshow_dialog_real_constructed (GObject* base) {
+	SetBackgroundSlideshowDialog * self;
+#line 1137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
+#line 1138 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	set_background_slideshow_dialog_on_delay_scale_value_changed (self);
+#line 11062 "Dialogs.c"
+}
+
+
+static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self) {
+	gboolean _tmp0_ = FALSE;
+	GtkCheckButton* _tmp1_ = NULL;
+	gboolean _tmp2_ = FALSE;
+	gboolean _tmp3_ = FALSE;
+#line 1142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self));
+#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp1_ = self->priv->desktop_background_checkbox;
+#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp3_ = _tmp2_;
+#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	if (_tmp3_) {
+#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp0_ = TRUE;
+#line 11083 "Dialogs.c"
+	} else {
+		GtkCheckButton* _tmp4_ = NULL;
+		gboolean _tmp5_ = FALSE;
+		gboolean _tmp6_ = FALSE;
+#line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp4_ = self->priv->screensaver_checkbox;
+#line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp6_ = _tmp5_;
+#line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp0_ = _tmp6_;
+#line 11096 "Dialogs.c"
+	}
+#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
+#line 11100 "Dialogs.c"
+}
+
+
+static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	set_background_slideshow_dialog_on_checkbox_clicked ((SetBackgroundSlideshowDialog*) self);
+#line 11107 "Dialogs.c"
 }
 
 
@@ -11505,57 +11136,57 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 	gint _tmp8_ = 0;
 	GtkLabel* _tmp29_ = NULL;
 	const gchar* _tmp30_ = NULL;
-#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self));
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->delay_scale;
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_range_get_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_adjustment_get_value (_tmp2_);
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value = _tmp4_;
-#line 1169 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = value;
-#line 1169 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = pow (_tmp5_, (gdouble) 5);
-#line 1169 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = pow ((gdouble) 90, (gdouble) 5);
-#line 1169 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->delay_value = (gint) (((((_tmp6_ / _tmp7_) * 60) * 60) * 24) + 5);
-#line 1173 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->delay_value;
-#line 1173 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ < 60) {
-#line 11520 "Dialogs.c"
+#line 11151 "Dialogs.c"
 		gint _tmp9_ = 0;
 		const gchar* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
 		gchar* _tmp12_ = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->delay_value;
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = ngettext ("%d second", "%d seconds", (gulong) _tmp9_);
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = self->priv->delay_value;
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = g_strdup_printf (_tmp10_, _tmp11_);
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp12_;
-#line 11537 "Dialogs.c"
+#line 11168 "Dialogs.c"
 	} else {
 		gint _tmp13_ = 0;
-#line 1175 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->delay_value;
-#line 1175 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp13_ < (60 * 60)) {
-#line 11544 "Dialogs.c"
+#line 11175 "Dialogs.c"
 			gint minutes = 0;
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
@@ -11563,34 +11194,34 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 			gint _tmp17_ = 0;
 			gchar* _tmp18_ = NULL;
 			gint _tmp19_ = 0;
-#line 1176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = self->priv->delay_value;
-#line 1176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			minutes = _tmp14_ / 60;
-#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = minutes;
-#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp16_ = ngettext ("%d minute", "%d minutes", (gulong) _tmp15_);
-#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp17_ = minutes;
-#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = g_strdup_printf (_tmp16_, _tmp17_);
-#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (text);
-#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			text = _tmp18_;
-#line 1178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp19_ = minutes;
-#line 1178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			self->priv->delay_value = _tmp19_ * 60;
-#line 11572 "Dialogs.c"
+#line 11203 "Dialogs.c"
 		} else {
 			gint _tmp20_ = 0;
-#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = self->priv->delay_value;
-#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp20_ < ((60 * 60) * 24)) {
-#line 11579 "Dialogs.c"
+#line 11210 "Dialogs.c"
 				gint hours = 0;
 				gint _tmp21_ = 0;
 				gint _tmp22_ = 0;
@@ -11598,53 +11229,60 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 				gint _tmp24_ = 0;
 				gchar* _tmp25_ = NULL;
 				gint _tmp26_ = 0;
-#line 1180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = self->priv->delay_value;
-#line 1180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				hours = _tmp21_ / (60 * 60);
-#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp22_ = hours;
-#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp23_ = ngettext ("%d hour", "%d hours", (gulong) _tmp22_);
-#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = hours;
-#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp25_ = g_strdup_printf (_tmp23_, _tmp24_);
-#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp25_;
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1168 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = hours;
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1168 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				self->priv->delay_value = _tmp26_ * (60 * 60);
-#line 11607 "Dialogs.c"
+#line 11238 "Dialogs.c"
 			} else {
 				const gchar* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
-#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = _ ("1 day");
-#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp28_ = g_strdup (_tmp27_);
-#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp28_;
-#line 1185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1171 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				self->priv->delay_value = (60 * 60) * 24;
-#line 11621 "Dialogs.c"
+#line 11252 "Dialogs.c"
 			}
 		}
 	}
-#line 1188 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->delay_value_label;
-#line 1188 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = text;
-#line 1188 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_label (_tmp29_, _tmp30_);
-#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 11633 "Dialogs.c"
+#line 11264 "Dialogs.c"
+}
+
+
+static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	set_background_slideshow_dialog_on_delay_scale_value_changed ((SetBackgroundSlideshowDialog*) self);
+#line 11271 "Dialogs.c"
 }
 
 
@@ -11654,85 +11292,128 @@ gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog*
 	gboolean _vala_screensaver = FALSE;
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-	gboolean _tmp2_ = FALSE;
+	GtkCheckButton* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1191 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gboolean _tmp4_ = FALSE;
+	GtkCheckButton* _tmp5_ = NULL;
+	gboolean _tmp6_ = FALSE;
+	gboolean _tmp7_ = FALSE;
+#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self), FALSE);
-#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = set_background_dialog_execute_base (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog));
-#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = _tmp0_;
-#line 1194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_result_ = _tmp0_ == ((gint) GTK_RESPONSE_OK);
+#line 1180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->delay_value;
-#line 1194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_delay_value = _tmp1_;
-#line 1195 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog)->desktop;
-#line 1195 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_desktop_background = _tmp2_;
-#line 1196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog)->screensaver;
-#line 1196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_screensaver = _tmp3_;
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = self->priv->desktop_background_checkbox;
+#line 1183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp4_ = _tmp3_;
+#line 1183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_vala_desktop_background = _tmp4_;
+#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp5_ = self->priv->screensaver_checkbox;
+#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp7_ = _tmp6_;
+#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_vala_screensaver = _tmp7_;
+#line 1186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (delay_value) {
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*delay_value = _vala_delay_value;
-#line 11671 "Dialogs.c"
+#line 11327 "Dialogs.c"
 	}
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (desktop_background) {
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*desktop_background = _vala_desktop_background;
-#line 11677 "Dialogs.c"
+#line 11333 "Dialogs.c"
 	}
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (screensaver) {
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*screensaver = _vala_screensaver;
-#line 11683 "Dialogs.c"
+#line 11339 "Dialogs.c"
 	}
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11687 "Dialogs.c"
+#line 11343 "Dialogs.c"
 }
 
 
 static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDialogClass * klass) {
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gint SetBackgroundSlideshowDialog_private_offset;
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_slideshow_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((SetBackgroundDialogClass *) klass)->finalize = set_background_slideshow_dialog_finalize;
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (SetBackgroundSlideshowDialogPrivate));
-#line 11698 "Dialogs.c"
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	((GObjectClass *) klass)->constructed = 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"
+	SetBackgroundSlideshowDialog_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/set_background_slideshow_dialog.ui");
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "desktop_background_checkbox", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, desktop_background_checkbox));
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "screensaver_checkbox", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, screensaver_checkbox));
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "delay_scale", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, delay_scale));
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "delay_value_label", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, delay_value_label));
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled));
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_delay_scale_value_changed", G_CALLBACK(_set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed));
+#line 11373 "Dialogs.c"
 }
 
 
 static void set_background_slideshow_dialog_instance_init (SetBackgroundSlideshowDialog * self) {
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE (self);
-#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->delay_value = 0;
-#line 11707 "Dialogs.c"
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 11384 "Dialogs.c"
 }
 
 
-static void set_background_slideshow_dialog_finalize (SetBackgroundDialog* obj) {
+static void set_background_slideshow_dialog_finalize (GObject* obj) {
 	SetBackgroundSlideshowDialog * self;
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
-#line 1148 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->delay_value_label);
-#line 1149 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->desktop_background_checkbox);
+#line 1122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->screensaver_checkbox);
+#line 1124 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->delay_scale);
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	SET_BACKGROUND_DIALOG_CLASS (set_background_slideshow_dialog_parent_class)->finalize (obj);
-#line 11721 "Dialogs.c"
+#line 1126 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->delay_value_label);
+#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	G_OBJECT_CLASS (set_background_slideshow_dialog_parent_class)->finalize (obj);
+#line 11402 "Dialogs.c"
 }
 
 
@@ -11741,7 +11422,7 @@ GType set_background_slideshow_dialog_get_type (void) {
 	if (g_once_init_enter (&set_background_slideshow_dialog_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundSlideshowDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_slideshow_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundSlideshowDialog), 0, (GInstanceInitFunc) set_background_slideshow_dialog_instance_init, NULL };
 		GType set_background_slideshow_dialog_type_id;
-		set_background_slideshow_dialog_type_id = g_type_register_static (TYPE_SET_BACKGROUND_DIALOG, "SetBackgroundSlideshowDialog", &g_define_type_info, 0);
+		set_background_slideshow_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "SetBackgroundSlideshowDialog", &g_define_type_info, 0);
 		g_once_init_leave (&set_background_slideshow_dialog_type_id__volatile, set_background_slideshow_dialog_type_id);
 	}
 	return set_background_slideshow_dialog_type_id__volatile;
@@ -11754,60 +11435,60 @@ TextEntryDialog* text_entry_dialog_construct (GType object_type) {
 	GtkSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 1213 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_settings_get_default ();
-#line 1213 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_header;
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 11753 "Dialogs.c"
+#line 11434 "Dialogs.c"
 	} else {
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 11757 "Dialogs.c"
+#line 11438 "Dialogs.c"
 	}
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (TextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1201 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11763 "Dialogs.c"
+#line 11444 "Dialogs.c"
 }
 
 
 TextEntryDialog* text_entry_dialog_new (void) {
-#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1201 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return text_entry_dialog_construct (TYPE_TEXT_ENTRY_DIALOG);
-#line 11770 "Dialogs.c"
+#line 11451 "Dialogs.c"
 }
 
 
 void text_entry_dialog_set_builder (TextEntryDialog* self, GtkBuilder* builder) {
 	GtkBuilder* _tmp0_ = NULL;
 	GtkBuilder* _tmp1_ = NULL;
-#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1207 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1207 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_BUILDER (builder));
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = builder;
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->builder = _tmp1_;
-#line 11789 "Dialogs.c"
+#line 11470 "Dialogs.c"
 }
 
 
 static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_entry_dialog_on_entry_changed ((TextEntryDialog*) self);
-#line 11796 "Dialogs.c"
+#line 11477 "Dialogs.c"
 }
 
 
@@ -11839,150 +11520,150 @@ void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyVali
 	GtkWidget* _tmp23_ = NULL;
 	GtkButton* _tmp24_ = NULL;
 	GeeCollection* _tmp25_ = NULL;
-#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (title != NULL);
-#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (label != NULL);
-#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail ((completion_list == NULL) || GEE_IS_COLLECTION (completion_list));
-#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = title;
-#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
-#line 1224 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = modify_validate;
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6__target = modify_validate_target;
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate = _tmp6_;
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate_target = _tmp6__target;
-#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->builder;
-#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_builder_get_object (_tmp7_, "label");
-#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
-#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	name_label = _tmp9_;
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = name_label;
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = label;
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_text (_tmp10_, _tmp11_);
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = self->priv->builder;
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = gtk_builder_get_object (_tmp12_, "entry");
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp13_) : NULL);
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->entry = _tmp14_;
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = initial_text;
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ != NULL) {
-#line 11896 "Dialogs.c"
+#line 11577 "Dialogs.c"
 		const gchar* _tmp17_ = NULL;
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = initial_text;
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _tmp17_;
-#line 11902 "Dialogs.c"
+#line 11583 "Dialogs.c"
 	} else {
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = "";
-#line 11906 "Dialogs.c"
+#line 11587 "Dialogs.c"
 	}
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->entry;
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_text (_tmp18_, _tmp15_);
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1224 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->entry;
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1224 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->entry;
-#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self, 0);
-#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
-#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_get_type (), GtkButton));
-#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->button1 = _tmp22_;
-#line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_SAVE_LABEL, (gint) GTK_RESPONSE_OK);
-#line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
-#line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->button2 = _tmp24_;
-#line 1239 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = completion_list;
-#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp25_ != NULL) {
-#line 11942 "Dialogs.c"
+#line 11623 "Dialogs.c"
 		EntryMultiCompletion* completion = NULL;
 		GeeCollection* _tmp26_ = NULL;
 		const gchar* _tmp27_ = NULL;
 		EntryMultiCompletion* _tmp28_ = NULL;
 		GtkEntry* _tmp29_ = NULL;
 		EntryMultiCompletion* _tmp30_ = NULL;
-#line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = completion_list;
-#line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = completion_delimiter;
-#line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = entry_multi_completion_new (_tmp26_, _tmp27_);
-#line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		completion = _tmp28_;
-#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = self->priv->entry;
-#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = completion;
-#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_completion (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_entry_completion_get_type (), GtkEntryCompletion));
-#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (completion);
-#line 11965 "Dialogs.c"
+#line 11646 "Dialogs.c"
 	}
-#line 1247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (name_label);
-#line 11971 "Dialogs.c"
+#line 11652 "Dialogs.c"
 }
 
 
@@ -11997,57 +11678,57 @@ gchar* text_entry_dialog_execute (TextEntryDialog* self) {
 	gint _tmp4_ = 0;
 	GtkEntry* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
-#line 1250 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG (self), NULL);
-#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->on_modify_validate;
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0__target = self->priv->on_modify_validate_target;
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->entry;
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
-#line 1256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) {
-#line 12008 "Dialogs.c"
+#line 11689 "Dialogs.c"
 		GtkEntry* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->entry;
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = gtk_entry_get_text (_tmp5_);
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp7_;
-#line 12022 "Dialogs.c"
+#line 11703 "Dialogs.c"
 	}
-#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->entry;
-#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp9_, NULL, FALSE);
-#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self);
-#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
-#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12036 "Dialogs.c"
+#line 11717 "Dialogs.c"
 }
 
 
@@ -12057,57 +11738,57 @@ void text_entry_dialog_on_entry_changed (TextEntryDialog* self) {
 	GtkEntry* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->on_modify_validate;
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0__target = self->priv->on_modify_validate_target;
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->entry;
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
-#line 12060 "Dialogs.c"
+#line 11741 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_class_init (TextEntryDialogClass * klass) {
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_entry_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (TextEntryDialogPrivate));
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = text_entry_dialog_finalize;
-#line 12071 "Dialogs.c"
+#line 11752 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_instance_init (TextEntryDialog * self) {
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
-#line 12078 "Dialogs.c"
+#line 11759 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_finalize (GObject* obj) {
 	TextEntryDialog * self;
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ENTRY_DIALOG, TextEntryDialog);
-#line 1206 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1207 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1209 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (text_entry_dialog_parent_class)->finalize (obj);
-#line 12096 "Dialogs.c"
+#line 11777 "Dialogs.c"
 }
 
 
@@ -12129,53 +11810,53 @@ MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type) {
 	GtkSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 1283 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_settings_get_default ();
-#line 1283 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_header;
-#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 12128 "Dialogs.c"
+#line 11809 "Dialogs.c"
 	} else {
-#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 12132 "Dialogs.c"
+#line 11813 "Dialogs.c"
 	}
-#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (MultiTextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12138 "Dialogs.c"
+#line 11819 "Dialogs.c"
 }
 
 
 MultiTextEntryDialog* multi_text_entry_dialog_new (void) {
-#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return multi_text_entry_dialog_construct (TYPE_MULTI_TEXT_ENTRY_DIALOG);
-#line 12145 "Dialogs.c"
+#line 11826 "Dialogs.c"
 }
 
 
 void multi_text_entry_dialog_set_builder (MultiTextEntryDialog* self, GtkBuilder* builder) {
 	GtkBuilder* _tmp0_ = NULL;
 	GtkBuilder* _tmp1_ = NULL;
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_BUILDER (builder));
-#line 1288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = builder;
-#line 1288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->builder = _tmp1_;
-#line 12164 "Dialogs.c"
+#line 11845 "Dialogs.c"
 }
 
 
@@ -12205,117 +11886,117 @@ void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDi
 	GtkButton* _tmp22_ = NULL;
 	GtkWidget* _tmp23_ = NULL;
 	GtkButton* _tmp24_ = NULL;
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (title != NULL);
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (label != NULL);
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = title;
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
-#line 1293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), 500, 300);
-#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = modify_validate;
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6__target = modify_validate_target;
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate = _tmp6_;
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate_target = _tmp6__target;
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->builder;
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_builder_get_object (_tmp7_, "textview1");
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_text_view_get_type ()) ? ((GtkTextView*) _tmp8_) : NULL);
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->entry = _tmp9_;
-#line 1300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = self->priv->entry;
-#line 1300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_text_view_set_wrap_mode (_tmp10_, GTK_WRAP_WORD);
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->entry;
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = gtk_text_buffer_new (NULL);
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_text_view_set_buffer (_tmp11_, _tmp13_);
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp13_);
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = initial_text;
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp15_ != NULL) {
-#line 12262 "Dialogs.c"
+#line 11943 "Dialogs.c"
 		const gchar* _tmp16_ = NULL;
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = initial_text;
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _tmp16_;
-#line 12268 "Dialogs.c"
+#line 11949 "Dialogs.c"
 	} else {
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = "";
-#line 12272 "Dialogs.c"
+#line 11953 "Dialogs.c"
 	}
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->entry;
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = gtk_text_view_get_buffer (_tmp17_);
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = _tmp18_;
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_set (_tmp19_, "text", _tmp14_, NULL);
-#line 1304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->entry;
-#line 1304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
-#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_get_type (), GtkButton));
-#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->button1 = _tmp22_;
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_SAVE_LABEL, (gint) GTK_RESPONSE_OK);
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->button2 = _tmp24_;
-#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 12304 "Dialogs.c"
+#line 11985 "Dialogs.c"
 }
 
 
@@ -12323,81 +12004,81 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) {
 	gchar* result = NULL;
 	gchar* text = NULL;
 	gint _tmp0_ = 0;
-#line 1311 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self), NULL);
-#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 1314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 12322 "Dialogs.c"
+#line 12003 "Dialogs.c"
 		GtkTextView* _tmp1_ = NULL;
 		GtkTextBuffer* _tmp2_ = NULL;
 		GtkTextBuffer* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->entry;
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = gtk_text_view_get_buffer (_tmp1_);
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp2_;
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_get (_tmp3_, "text", &_tmp4_, NULL);
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp4_;
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp5_;
-#line 12342 "Dialogs.c"
+#line 12023 "Dialogs.c"
 	}
-#line 1319 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
-#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12350 "Dialogs.c"
+#line 12031 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_class_init (MultiTextEntryDialogClass * klass) {
-#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	multi_text_entry_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (MultiTextEntryDialogPrivate));
-#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = multi_text_entry_dialog_finalize;
-#line 12361 "Dialogs.c"
+#line 12042 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_instance_init (MultiTextEntryDialog * self) {
-#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
-#line 12368 "Dialogs.c"
+#line 12049 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_finalize (GObject* obj) {
 	MultiTextEntryDialog * self;
-#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialog);
-#line 1276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1279 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (multi_text_entry_dialog_parent_class)->finalize (obj);
-#line 12386 "Dialogs.c"
+#line 12067 "Dialogs.c"
 }
 
 
@@ -12418,24 +12099,24 @@ EventRenameDialog* event_rename_dialog_construct (GType object_type, const gchar
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _ ("Rename Event");
-#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _ ("Name:");
-#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = event_name;
-#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EventRenameDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, NULL, NULL);
-#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12417 "Dialogs.c"
+#line 12098 "Dialogs.c"
 }
 
 
 EventRenameDialog* event_rename_dialog_new (const gchar* event_name) {
-#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return event_rename_dialog_construct (TYPE_EVENT_RENAME_DIALOG, event_name);
-#line 12424 "Dialogs.c"
+#line 12105 "Dialogs.c"
 }
 
 
@@ -12445,39 +12126,39 @@ static gchar* event_rename_dialog_real_execute (EventRenameDialog* self) {
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = event_prep_event_name (_tmp1_);
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12448 "Dialogs.c"
+#line 12129 "Dialogs.c"
 }
 
 
 gchar* event_rename_dialog_execute (EventRenameDialog* self) {
-#line 1330 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EVENT_RENAME_DIALOG (self), NULL);
-#line 1330 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EVENT_RENAME_DIALOG_GET_CLASS (self)->execute (self);
-#line 12457 "Dialogs.c"
+#line 12138 "Dialogs.c"
 }
 
 
 static void event_rename_dialog_class_init (EventRenameDialogClass * klass) {
-#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	event_rename_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EventRenameDialogClass *) klass)->execute = event_rename_dialog_real_execute;
-#line 12466 "Dialogs.c"
+#line 12147 "Dialogs.c"
 }
 
 
@@ -12502,24 +12183,24 @@ EditTitleDialog* edit_title_dialog_construct (GType object_type, const gchar* ph
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = C_ ("Dialog Title", "Edit Title");
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _ ("Title:");
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = photo_title;
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EditTitleDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, NULL, NULL);
-#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12501 "Dialogs.c"
+#line 12182 "Dialogs.c"
 }
 
 
 EditTitleDialog* edit_title_dialog_new (const gchar* photo_title) {
-#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return edit_title_dialog_construct (TYPE_EDIT_TITLE_DIALOG, photo_title);
-#line 12508 "Dialogs.c"
+#line 12189 "Dialogs.c"
 }
 
 
@@ -12529,56 +12210,56 @@ static gchar* edit_title_dialog_real_execute (EditTitleDialog* self) {
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = media_source_prep_title (_tmp1_);
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12532 "Dialogs.c"
+#line 12213 "Dialogs.c"
 }
 
 
 gchar* edit_title_dialog_execute (EditTitleDialog* self) {
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1332 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EDIT_TITLE_DIALOG (self), NULL);
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1332 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EDIT_TITLE_DIALOG_GET_CLASS (self)->execute (self);
-#line 12541 "Dialogs.c"
+#line 12222 "Dialogs.c"
 }
 
 
 static gboolean edit_title_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text) {
 	EditTitleDialog * self;
 	gboolean result = FALSE;
-#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_TITLE_DIALOG, EditTitleDialog);
-#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12556 "Dialogs.c"
+#line 12237 "Dialogs.c"
 }
 
 
 static void edit_title_dialog_class_init (EditTitleDialogClass * klass) {
-#line 1335 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	edit_title_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1335 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EditTitleDialogClass *) klass)->execute = edit_title_dialog_real_execute;
-#line 1335 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = edit_title_dialog_real_on_modify_validate;
-#line 12567 "Dialogs.c"
+#line 12248 "Dialogs.c"
 }
 
 
@@ -12606,47 +12287,47 @@ EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar
 	gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
-#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = is_event;
-#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 12599 "Dialogs.c"
+#line 12280 "Dialogs.c"
 		const gchar* _tmp2_ = NULL;
-#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = _ ("Edit Event Comment");
-#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp2_;
-#line 12605 "Dialogs.c"
+#line 12286 "Dialogs.c"
 	} else {
 		const gchar* _tmp3_ = NULL;
-#line 1356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _ ("Edit Photo/Video Comment");
-#line 1356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp3_;
-#line 12612 "Dialogs.c"
+#line 12293 "Dialogs.c"
 	}
-#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_strdup (_tmp0_);
-#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	title_tmp = _tmp4_;
-#line 1357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _ ("Comment:");
-#line 1357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = comment;
-#line 1357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EditCommentDialog*) multi_text_entry_dialog_mediator_construct (object_type, title_tmp, _tmp5_, _tmp6_);
-#line 1352 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (title_tmp);
-#line 1352 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12628 "Dialogs.c"
+#line 12309 "Dialogs.c"
 }
 
 
 EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event) {
-#line 1352 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return edit_comment_dialog_construct (TYPE_EDIT_COMMENT_DIALOG, comment, is_event);
-#line 12635 "Dialogs.c"
+#line 12316 "Dialogs.c"
 }
 
 
@@ -12656,56 +12337,56 @@ static gchar* edit_comment_dialog_real_execute (EditCommentDialog* self) {
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _multi_text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR, MultiTextEntryDialogMediator));
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = media_source_prep_comment (_tmp1_);
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12659 "Dialogs.c"
+#line 12340 "Dialogs.c"
 }
 
 
 gchar* edit_comment_dialog_execute (EditCommentDialog* self) {
-#line 1360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EDIT_COMMENT_DIALOG (self), NULL);
-#line 1360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EDIT_COMMENT_DIALOG_GET_CLASS (self)->execute (self);
-#line 12668 "Dialogs.c"
+#line 12349 "Dialogs.c"
 }
 
 
 static gboolean edit_comment_dialog_real_on_modify_validate (MultiTextEntryDialogMediator* base, const gchar* text) {
 	EditCommentDialog * self;
 	gboolean result = FALSE;
-#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_COMMENT_DIALOG, EditCommentDialog);
-#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12683 "Dialogs.c"
+#line 12364 "Dialogs.c"
 }
 
 
 static void edit_comment_dialog_class_init (EditCommentDialogClass * klass) {
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	edit_comment_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EditCommentDialogClass *) klass)->execute = edit_comment_dialog_real_execute;
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = edit_comment_dialog_real_on_modify_validate;
-#line 12694 "Dialogs.c"
+#line 12375 "Dialogs.c"
 }
 
 
@@ -12742,63 +12423,63 @@ GtkResponseType remove_from_library_dialog (GtkWindow* owner, const gchar* title
 	gchar* _tmp10_ = NULL;
 	GtkResponseType _result_ = 0;
 	gint _tmp11_ = 0;
-#line 1371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), 0);
-#line 1371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, 0);
-#line 1371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (user_message != NULL, 0);
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = count;
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = ngettext ("Remove and _Trash File", "Remove and _Trash Files", (gulong) _tmp0_);
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	trash_action = _tmp2_;
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = owner;
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = user_message;
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp3_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, "%s", _tmp4_);
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp5_);
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp5_;
-#line 1377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("_Remove From Library");
-#line 1377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp6_, (gint) GTK_RESPONSE_NO);
-#line 1378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), trash_action, (gint) GTK_RESPONSE_YES);
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = title;
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = user_message;
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = build_alert_body_text (_tmp7_, _tmp8_, TRUE);
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp10_);
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp11_;
-#line 1387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (trash_action);
-#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12787 "Dialogs.c"
+#line 12468 "Dialogs.c"
 }
 
 
@@ -12816,57 +12497,57 @@ GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* ti
 	gchar* _tmp8_ = NULL;
 	GtkResponseType _result_ = 0;
 	gint _tmp9_ = 0;
-#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), 0);
-#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, 0);
-#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (user_message != NULL, 0);
-#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = owner;
-#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = user_message;
-#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp1_);
-#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp2_;
-#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1387 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _ ("_Keep");
-#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1387 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp3_, (gint) GTK_RESPONSE_NO);
-#line 1398 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _ ("_Delete");
-#line 1398 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp4_, (gint) GTK_RESPONSE_YES);
-#line 1399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_NO);
-#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = title;
-#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = user_message;
-#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp8_);
-#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp8_);
-#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp9_;
-#line 1405 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12855 "Dialogs.c"
+#line 12536 "Dialogs.c"
 }
 
 
@@ -12905,26 +12586,26 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 	gint _tmp37_ = 0;
 	GtkMessageDialog* _tmp38_ = NULL;
 	GtkResponseType _tmp39_ = 0;
-#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE);
-#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (photos), FALSE);
-#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	count = 0;
-#line 12900 "Dialogs.c"
+#line 12581 "Dialogs.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = photos;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_photo_it = _tmp1_;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 12913 "Dialogs.c"
+#line 12594 "Dialogs.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			Photo* photo = NULL;
@@ -12932,171 +12613,171 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 			gpointer _tmp5_ = NULL;
 			Photo* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = _photo_it;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp3_) {
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 12929 "Dialogs.c"
+#line 12610 "Dialogs.c"
 			}
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _photo_it;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			photo = (Photo*) _tmp5_;
-#line 1413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = photo;
-#line 1413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = photo_has_editable (_tmp6_);
-#line 1413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp7_) {
-#line 12943 "Dialogs.c"
+#line 12624 "Dialogs.c"
 				gint _tmp8_ = 0;
-#line 1414 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp8_ = count;
-#line 1414 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				count = _tmp8_ + 1;
-#line 12949 "Dialogs.c"
+#line 12630 "Dialogs.c"
 			}
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (photo);
-#line 12953 "Dialogs.c"
+#line 12634 "Dialogs.c"
 		}
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_photo_it);
-#line 12957 "Dialogs.c"
+#line 12638 "Dialogs.c"
 	}
-#line 1417 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = count;
-#line 1417 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ == 0) {
-#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 12967 "Dialogs.c"
+#line 12648 "Dialogs.c"
 	}
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = count;
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_ == 1) {
-#line 12973 "Dialogs.c"
+#line 12654 "Dialogs.c"
 		const gchar* _tmp12_ = NULL;
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _ ("Revert External Edit?");
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp12_;
-#line 12979 "Dialogs.c"
+#line 12660 "Dialogs.c"
 	} else {
 		const gchar* _tmp13_ = NULL;
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _ ("Revert External Edits?");
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp13_;
-#line 12986 "Dialogs.c"
+#line 12667 "Dialogs.c"
 	}
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = g_strdup (_tmp10_);
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	headline = _tmp14_;
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = count;
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = ngettext ("This will destroy all changes made to the external file. Continue?", "This will destroy all changes made to %d external files. Continue?", (gulong) _tmp15_);
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = count;
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = g_strdup_printf (_tmp16_, _tmp17_);
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp18_;
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = count;
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp20_ == 1) {
-#line 13006 "Dialogs.c"
+#line 12687 "Dialogs.c"
 		const gchar* _tmp21_ = NULL;
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _ ("Re_vert External Edit");
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp21_;
-#line 13012 "Dialogs.c"
+#line 12693 "Dialogs.c"
 	} else {
 		const gchar* _tmp22_ = NULL;
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = _ ("Re_vert External Edits");
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp22_;
-#line 13019 "Dialogs.c"
+#line 12700 "Dialogs.c"
 	}
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = g_strdup (_tmp19_);
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	action = _tmp23_;
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = owner;
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = msg;
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp24_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp25_);
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp26_);
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp26_;
-#line 1430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = dialog;
-#line 1430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = _ ("_Cancel");
-#line 1430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_dialog_get_type (), GtkDialog), _tmp28_, (gint) GTK_RESPONSE_CANCEL);
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = dialog;
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = action;
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_dialog_get_type (), GtkDialog), _tmp30_, (gint) GTK_RESPONSE_YES);
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = dialog;
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = headline;
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = msg;
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = build_alert_body_text (_tmp32_, _tmp33_, TRUE);
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = _tmp34_;
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (_tmp31_, _tmp35_);
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp35_);
-#line 1435 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = dialog;
-#line 1435 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_dialog_get_type (), GtkDialog));
-#line 1435 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp37_;
-#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = dialog;
-#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = _result_;
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp39_ == GTK_RESPONSE_YES;
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (action);
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (headline);
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13085 "Dialogs.c"
+#line 12766 "Dialogs.c"
 }
 
 
@@ -13124,110 +12805,110 @@ gboolean remove_offline_dialog (GtkWindow* owner, gint count) {
 	gint _tmp18_ = 0;
 	GtkMessageDialog* _tmp19_ = NULL;
 	GtkResponseType _tmp20_ = 0;
-#line 1442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE);
-#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = count;
-#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == 0) {
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 13123 "Dialogs.c"
+#line 12804 "Dialogs.c"
 	}
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = count;
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = ngettext ("This will remove the photo from the library. Continue?", "This will remove %d photos from the library. Continue?", (gulong) _tmp1_);
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = count;
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_strdup_printf (_tmp2_, _tmp3_);
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp4_;
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = owner;
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = msg;
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp5_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp6_);
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp7_);
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp7_;
-#line 1453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = dialog;
-#line 1453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _ ("_Cancel");
-#line 1453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_dialog_get_type (), GtkDialog), _tmp9_, (gint) GTK_RESPONSE_CANCEL);
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = dialog;
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _ ("_Remove");
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog), _tmp11_, (gint) GTK_RESPONSE_OK);
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = count;
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp13_ == 1) {
-#line 13161 "Dialogs.c"
+#line 12842 "Dialogs.c"
 		const gchar* _tmp14_ = NULL;
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _ ("Remove Photo From Library");
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp14_;
-#line 13167 "Dialogs.c"
+#line 12848 "Dialogs.c"
 	} else {
 		const gchar* _tmp15_ = NULL;
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _ ("Remove Photos From Library");
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp15_;
-#line 13174 "Dialogs.c"
+#line 12855 "Dialogs.c"
 	}
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = dialog;
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_window_get_type (), GtkWindow), _tmp12_);
-#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = dialog;
-#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_dialog_get_type (), GtkDialog));
-#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp18_;
-#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = dialog;
-#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = _result_;
-#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp20_ == GTK_RESPONSE_OK;
-#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13200 "Dialogs.c"
+#line 12881 "Dialogs.c"
 }
 
 
 static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_on_cancel ((ProgressDialog*) self);
-#line 13207 "Dialogs.c"
+#line 12888 "Dialogs.c"
 }
 
 
 static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = progress_dialog_on_window_closed ((ProgressDialog*) self);
-#line 1495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13216 "Dialogs.c"
+#line 12897 "Dialogs.c"
 }
 
 
@@ -13258,207 +12939,207 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner,
 	GtkBox* _tmp23_ = NULL;
 	GtkBox* _tmp24_ = NULL;
 	gulong _tmp25_ = 0UL;
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail ((owner == NULL) || GTK_IS_WINDOW (owner), NULL);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), NULL);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ProgressDialog*) g_object_new (object_type, NULL);
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = cancellable;
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->cancellable = _tmp1_;
-#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = text;
-#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp2_);
-#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 1481 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = owner;
-#line 1481 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ != NULL) {
-#line 13273 "Dialogs.c"
+#line 12954 "Dialogs.c"
 		GtkWindow* _tmp4_ = NULL;
-#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = owner;
-#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
-#line 13279 "Dialogs.c"
+#line 12960 "Dialogs.c"
 	}
-#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 1486 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->progress_bar;
-#line 1486 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 300, -1);
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = self->priv->progress_bar;
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_show_text (_tmp6_, TRUE);
-#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp7_);
-#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	vbox_bar = _tmp7_;
-#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = vbox_bar;
-#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->progress_bar;
-#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = cancellable;
-#line 1492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp10_ != NULL) {
-#line 13309 "Dialogs.c"
+#line 12990 "Dialogs.c"
 		GtkButton* _tmp11_ = NULL;
 		GtkButton* _tmp12_ = NULL;
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp11_);
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->cancel_button);
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->cancel_button = _tmp11_;
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->cancel_button;
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_signal_connect_object (_tmp12_, "clicked", (GCallback) _progress_dialog_on_cancel_gtk_button_clicked, self, 0);
-#line 1495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _progress_dialog_on_window_closed_gtk_widget_delete_event, self, 0);
-#line 13326 "Dialogs.c"
+#line 13007 "Dialogs.c"
 	}
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp13_);
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	hbox = _tmp13_;
-#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = hbox;
-#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = vbox_bar;
-#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->cancel_button;
-#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ != NULL) {
-#line 13344 "Dialogs.c"
+#line 13025 "Dialogs.c"
 		GtkBox* _tmp17_ = NULL;
 		GtkButton* _tmp18_ = NULL;
-#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = hbox;
-#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->cancel_button;
-#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_end (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 13353 "Dialogs.c"
+#line 13034 "Dialogs.c"
 	}
-#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = (GtkLabel*) gtk_label_new ("");
-#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp19_);
-#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	primary_text_label = _tmp19_;
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = text;
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = g_strdup_printf ("<span weight=\"bold\">%s</span>", _tmp20_);
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (primary_text_label, _tmp22_);
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp22_);
-#line 1505 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_xalign (primary_text_label, 0.0f);
-#line 1506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_yalign (primary_text_label, 0.5f);
-#line 1508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-#line 1508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp23_);
-#line 1508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	vbox = _tmp23_;
-#line 1509 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (primary_text_label, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = hbox;
-#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1514 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1505 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
-#line 1516 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
-#line 1517 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
-#line 1518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
-#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget));
-#line 1522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = now_ms ();
-#line 1522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->time_started = _tmp25_;
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (vbox);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (primary_text_label);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (hbox);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (vbox_bar);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 13419 "Dialogs.c"
+#line 13100 "Dialogs.c"
 }
 
 
 ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable) {
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return progress_dialog_construct (TYPE_PROGRESS_DIALOG, owner, text, cancellable);
-#line 13426 "Dialogs.c"
+#line 13107 "Dialogs.c"
 }
 
 
 static void progress_dialog_real_realize (GtkWidget* base) {
 	ProgressDialog * self;
 	GCancellable* _tmp0_ = NULL;
-#line 1525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PROGRESS_DIALOG, ProgressDialog);
-#line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	GTK_WIDGET_CLASS (progress_dialog_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
-#line 1529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->cancellable;
-#line 1529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 13441 "Dialogs.c"
+#line 13122 "Dialogs.c"
 		GdkWindow* _tmp1_ = NULL;
-#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gdk_window_set_functions (_tmp1_, GDK_FUNC_MOVE);
-#line 13447 "Dialogs.c"
+#line 13128 "Dialogs.c"
 	}
 }
 
@@ -13466,44 +13147,44 @@ static void progress_dialog_real_realize (GtkWidget* base) {
 void progress_dialog_update_display_every (ProgressDialog* self, gint update_every) {
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 1533 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = update_every;
-#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0_ >= 1, "update_every >= 1");
-#line 1536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = update_every;
-#line 1536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->update_every = _tmp1_;
-#line 13465 "Dialogs.c"
+#line 13146 "Dialogs.c"
 }
 
 
 void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec) {
 	gint _tmp0_ = 0;
-#line 1539 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = minimum_on_screen_time_msec;
-#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minimum_on_screen_time_msec = _tmp0_;
-#line 13477 "Dialogs.c"
+#line 13158 "Dialogs.c"
 }
 
 
 void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total) {
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1544 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = current;
-#line 1544 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = total;
-#line 1544 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_set_percentage (self, ((gdouble) _tmp0_) / ((gdouble) _tmp1_));
-#line 13492 "Dialogs.c"
+#line 13173 "Dialogs.c"
 }
 
 
@@ -13518,58 +13199,58 @@ void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct) {
 	gdouble _tmp7_ = 0.0;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 1547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1548 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = pct;
-#line 1548 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = CLAMP (_tmp0_, 0.0, 1.0);
-#line 1548 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pct = _tmp1_;
-#line 1550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = pct;
-#line 1550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_maybe_show_all (self, _tmp2_);
-#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->progress_bar;
-#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = pct;
-#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_fraction (_tmp3_, _tmp4_);
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->progress_bar;
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("%d%%");
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = pct;
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = g_strdup_printf (_tmp6_, (gint) (_tmp7_ * 100.0));
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_text (_tmp5_, _tmp9_);
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp9_);
-#line 13539 "Dialogs.c"
+#line 13220 "Dialogs.c"
 }
 
 
 void progress_dialog_set_status (ProgressDialog* self, const gchar* text) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (text != NULL);
-#line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->progress_bar;
-#line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 13558 "Dialogs.c"
+#line 13239 "Dialogs.c"
 }
 
 
@@ -13581,131 +13262,131 @@ gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 t
 	GCancellable* _tmp9_ = NULL;
 	gboolean keep_going = FALSE;
 	gboolean _tmp12_ = FALSE;
-#line 1572 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->last_count;
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == G_MAXUINT64) {
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 13578 "Dialogs.c"
+#line 13259 "Dialogs.c"
 	} else {
 		guint64 _tmp2_ = 0ULL;
 		guint64 _tmp3_ = 0ULL;
 		gint _tmp4_ = 0;
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = count;
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->last_count;
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->update_every;
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = (_tmp2_ - _tmp3_) >= ((guint64) _tmp4_);
-#line 13591 "Dialogs.c"
+#line 13272 "Dialogs.c"
 	}
-#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 13595 "Dialogs.c"
+#line 13276 "Dialogs.c"
 		guint64 _tmp5_ = 0ULL;
 		guint64 _tmp6_ = 0ULL;
 		guint64 _tmp7_ = 0ULL;
-#line 1574 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = count;
-#line 1574 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = total;
-#line 1574 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress_dialog_set_percentage (self, ((gdouble) _tmp5_) / ((gdouble) _tmp6_));
-#line 1575 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = count;
-#line 1575 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->last_count = _tmp7_;
-#line 13609 "Dialogs.c"
+#line 13290 "Dialogs.c"
 	}
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->cancellable;
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ != NULL) {
-#line 13615 "Dialogs.c"
+#line 13296 "Dialogs.c"
 		GCancellable* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->cancellable;
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = g_cancellable_is_cancelled (_tmp10_);
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = !_tmp11_;
-#line 13624 "Dialogs.c"
+#line 13305 "Dialogs.c"
 	} else {
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = TRUE;
-#line 13628 "Dialogs.c"
+#line 13309 "Dialogs.c"
 	}
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	keep_going = _tmp8_;
-#line 1586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = do_event_loop;
-#line 1586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp12_) {
-#line 1587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		spin_event_loop ();
-#line 13638 "Dialogs.c"
+#line 13319 "Dialogs.c"
 	}
-#line 1589 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = keep_going;
-#line 1589 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13644 "Dialogs.c"
+#line 13325 "Dialogs.c"
 }
 
 
 void progress_dialog_close (ProgressDialog* self) {
-#line 1592 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 13655 "Dialogs.c"
+#line 13336 "Dialogs.c"
 }
 
 
 static gboolean progress_dialog_on_window_closed (ProgressDialog* self) {
 	gboolean result = FALSE;
-#line 1601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1591 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
-#line 1602 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_on_cancel (self);
-#line 1603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
-#line 1603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13669 "Dialogs.c"
+#line 13350 "Dialogs.c"
 }
 
 
 static void progress_dialog_on_cancel (ProgressDialog* self) {
 	GCancellable* _tmp0_ = NULL;
 	GtkButton* _tmp2_ = NULL;
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->cancellable;
-#line 1608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ != NULL) {
-#line 13682 "Dialogs.c"
+#line 13363 "Dialogs.c"
 		GCancellable* _tmp1_ = NULL;
-#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->cancellable;
-#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_cancellable_cancel (_tmp1_);
-#line 13688 "Dialogs.c"
+#line 13369 "Dialogs.c"
 	}
-#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->cancel_button;
-#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 13694 "Dialogs.c"
+#line 13375 "Dialogs.c"
 }
 
 
@@ -13713,35 +13394,35 @@ static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp2_) {
-#line 13710 "Dialogs.c"
+#line 13391 "Dialogs.c"
 		gulong _tmp3_ = 0UL;
 		gulong _tmp4_ = 0UL;
 		gint _tmp5_ = 0;
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = now_ms ();
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->time_started;
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->minimum_on_screen_time_msec;
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = (_tmp3_ - _tmp4_) > ((gulong) _tmp5_);
-#line 13722 "Dialogs.c"
+#line 13403 "Dialogs.c"
 	} else {
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 13726 "Dialogs.c"
+#line 13407 "Dialogs.c"
 	}
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 13730 "Dialogs.c"
+#line 13411 "Dialogs.c"
 		gdouble pps = 0.0;
 		gdouble _tmp6_ = 0.0;
 		gint _tmp7_ = 0;
@@ -13749,80 +13430,80 @@ static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
 		gdouble _tmp8_ = 0.0;
 		gdouble _tmp9_ = 0.0;
 		gint _tmp10_ = 0;
-#line 1619 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = pct;
-#line 1619 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->minimum_on_screen_time_msec;
-#line 1619 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		pps = (_tmp6_ * 100.0) / _tmp7_;
-#line 1621 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = pps;
-#line 1621 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ttc = 100.0 / _tmp8_;
-#line 1624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = ttc;
-#line 1624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->minimum_on_screen_time_msec;
-#line 1624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_ > ((gdouble) _tmp10_)) {
-#line 1629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1630 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			spin_event_loop ();
-#line 13758 "Dialogs.c"
+#line 13439 "Dialogs.c"
 		}
 	}
 }
 
 
 static void progress_dialog_class_init (ProgressDialogClass * klass) {
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (ProgressDialogPrivate));
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((GtkWidgetClass *) klass)->realize = progress_dialog_real_realize;
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_dialog_finalize;
-#line 13773 "Dialogs.c"
+#line 13454 "Dialogs.c"
 }
 
 
 static void progress_dialog_instance_init (ProgressDialog * self) {
 	GtkProgressBar* _tmp0_ = NULL;
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = PROGRESS_DIALOG_GET_PRIVATE (self);
-#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->progress_bar = _tmp0_;
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->cancel_button = NULL;
-#line 1468 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->last_count = G_MAXUINT64;
-#line 1469 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->update_every = 1;
-#line 1470 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minimum_on_screen_time_msec = 500;
-#line 13795 "Dialogs.c"
+#line 13476 "Dialogs.c"
 }
 
 
 static void progress_dialog_finalize (GObject* obj) {
 	ProgressDialog * self;
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_DIALOG, ProgressDialog);
-#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->progress_bar);
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->cancel_button);
-#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (progress_dialog_parent_class)->finalize (obj);
-#line 13811 "Dialogs.c"
+#line 13492 "Dialogs.c"
 }
 
 
@@ -13851,68 +13532,68 @@ static GType adjust_date_time_dialog_time_system_get_type (void) {
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
-#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13842 "Dialogs.c"
+#line 13523 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self) {
-#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13849 "Dialogs.c"
+#line 13530 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self) {
-#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13856 "Dialogs.c"
+#line 13537 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self) {
-#line 1685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13863 "Dialogs.c"
+#line 13544 "Dialogs.c"
 }
 
 
 static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, gpointer self) {
 	gboolean result;
 	result = adjust_date_time_dialog_on_spin_button_output ((AdjustDateTimeDialog*) self, _sender);
-#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13872 "Dialogs.c"
+#line 13553 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_system_changed ((AdjustDateTimeDialog*) self);
-#line 13879 "Dialogs.c"
+#line 13560 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13886 "Dialogs.c"
+#line 13567 "Dialogs.c"
 }
 
 
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return;
-#line 13901 "Dialogs.c"
+#line 13582 "Dialogs.c"
 }
 
 
@@ -14048,367 +13729,367 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 	ConfigFacade* _tmp158_ = NULL;
 	gboolean _tmp159_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_DATEABLE (source), NULL);
-#line 1667 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = source;
-#line 1667 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0_ != NULL, "source != null");
-#line 1670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_settings_get_default ();
-#line 1670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = use_header;
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_) {
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = 1;
-#line 14053 "Dialogs.c"
+#line 13734 "Dialogs.c"
 	} else {
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = 0;
-#line 14057 "Dialogs.c"
+#line 13738 "Dialogs.c"
 	}
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (AdjustDateTimeDialog*) g_object_new (object_type, "use-header-bar", _tmp2_, NULL);
-#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1663 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1664 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1667 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
-#line 1679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1669 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_ADJUST_DATE_TIME_LABEL);
-#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkCalendar*) gtk_calendar_new ();
-#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp6_);
-#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->calendar);
-#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->calendar = _tmp6_;
-#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->calendar;
-#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp7_, "day-selected", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected, self, 0);
-#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->calendar;
-#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp8_, "month-changed", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed, self, 0);
-#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->calendar;
-#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp9_, "next-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year, self, 0);
-#line 1685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = self->priv->calendar;
-#line 1685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp10_, "prev-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year, self, 0);
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = config_facade_get_instance ();
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_;
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp12_);
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_) {
-#line 14113 "Dialogs.c"
+#line 13794 "Dialogs.c"
 		GtkSpinButton* _tmp15_ = NULL;
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 23, (gdouble) 1);
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp15_);
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->hour);
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->hour = _tmp15_;
-#line 14123 "Dialogs.c"
+#line 13804 "Dialogs.c"
 	} else {
 		GtkSpinButton* _tmp16_ = NULL;
-#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 1, (gdouble) 12, (gdouble) 1);
-#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp16_);
-#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->hour);
-#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->hour = _tmp16_;
-#line 14134 "Dialogs.c"
+#line 13815 "Dialogs.c"
 	}
-#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->hour;
-#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp17_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->hour;
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->hour;
-#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp20_);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->minute);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minute = _tmp20_;
-#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = self->priv->minute;
-#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->minute;
-#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = self->priv->minute;
-#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp23_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
-#line 1701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp24_);
-#line 1701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->second);
-#line 1701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->second = _tmp24_;
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = self->priv->second;
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = self->priv->second;
-#line 1703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = self->priv->second;
-#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp27_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp28_);
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->system);
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->system = _tmp28_;
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->system;
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = _ ("AM");
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp29_, _tmp30_);
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = self->priv->system;
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = _ ("PM");
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp31_, _tmp32_);
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = self->priv->system;
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = _ ("24 Hr");
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp33_, _tmp34_);
-#line 1710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = self->priv->system;
-#line 1710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed, self, 0);
-#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp36_);
-#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	clock = _tmp36_;
-#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = clock;
-#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = self->priv->hour;
-#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = clock;
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = (GtkLabel*) gtk_label_new (":");
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp40_);
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp41_ = _tmp40_;
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp41_);
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = clock;
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = self->priv->minute;
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = clock;
-#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = (GtkLabel*) gtk_label_new (":");
-#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp45_);
-#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = _tmp45_;
-#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp46_);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = clock;
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp48_ = self->priv->second;
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = clock;
-#line 1719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp50_ = self->priv->system;
-#line 1719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp51_ = _ ("_Shift photos/videos by the same amount");
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (NULL, _tmp51_);
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp52_);
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->relativity_radio_button);
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->relativity_radio_button = _tmp52_;
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp53_ = self->priv->relativity_radio_button;
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = config_facade_get_instance ();
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp55_ = _tmp54_;
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp56_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp56_);
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp55_);
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp58_ = display_options;
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp58_) {
-#line 14300 "Dialogs.c"
+#line 13981 "Dialogs.c"
 		gint _tmp59_ = 0;
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp59_ = photo_count;
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp57_ = _tmp59_ > 1;
-#line 14306 "Dialogs.c"
+#line 13987 "Dialogs.c"
 	} else {
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp57_ = FALSE;
-#line 14310 "Dialogs.c"
+#line 13991 "Dialogs.c"
 	}
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp60_ = self->priv->relativity_radio_button;
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), _tmp57_);
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp61_ = self->priv->relativity_radio_button;
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp62_ = gtk_radio_button_get_group (_tmp61_);
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp63_ = _ ("Set _all photos/videos to this time");
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp64_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (_tmp62_, _tmp63_);
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp64_);
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->batch_radio_button);
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->batch_radio_button = _tmp64_;
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp65_ = self->priv->batch_radio_button;
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp66_ = config_facade_get_instance ();
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = _tmp66_;
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_toggle_button_get_type (), GtkToggleButton), !_tmp68_);
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp67_);
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70_ = display_options;
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp70_) {
-#line 14346 "Dialogs.c"
+#line 14027 "Dialogs.c"
 		gint _tmp71_ = 0;
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = photo_count;
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp69_ = _tmp71_ > 1;
-#line 14352 "Dialogs.c"
+#line 14033 "Dialogs.c"
 	} else {
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp69_ = FALSE;
-#line 14356 "Dialogs.c"
+#line 14037 "Dialogs.c"
 	}
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp72_ = self->priv->batch_radio_button;
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), _tmp69_);
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = self->priv->batch_radio_button;
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled, self, 0);
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp74_ = contains_video;
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp74_) {
-#line 14370 "Dialogs.c"
+#line 14051 "Dialogs.c"
 		gchar* text = NULL;
 		gint _tmp75_ = 0;
 		const gchar* _tmp76_ = NULL;
 		gchar* _tmp77_ = NULL;
 		const gchar* _tmp78_ = NULL;
 		GtkCheckButton* _tmp79_ = NULL;
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp75_ = photo_count;
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp76_ = ngettext ("_Modify original photo file", "_Modify original photo files", (gulong) _tmp75_);
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp77_ = g_strdup (_tmp76_);
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp77_;
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp78_ = text;
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp79_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp78_);
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp79_);
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->modify_originals_check_button = _tmp79_;
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 14397 "Dialogs.c"
+#line 14078 "Dialogs.c"
 	} else {
 		gchar* text = NULL;
 		gint _tmp80_ = 0;
@@ -14416,181 +14097,181 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 		gchar* _tmp82_ = NULL;
 		const gchar* _tmp83_ = NULL;
 		GtkCheckButton* _tmp84_ = NULL;
-#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp80_ = photo_count;
-#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp81_ = ngettext ("_Modify original file", "_Modify original files", (gulong) _tmp80_);
-#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp82_ = g_strdup (_tmp81_);
-#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp82_;
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = text;
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp84_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp83_);
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp84_);
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->modify_originals_check_button = _tmp84_;
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 14425 "Dialogs.c"
+#line 14106 "Dialogs.c"
 	}
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp86_ = config_facade_get_instance ();
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp87_ = _tmp86_;
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp89_ = _tmp88_;
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp87_);
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp89_) {
-#line 14439 "Dialogs.c"
+#line 14120 "Dialogs.c"
 		gboolean _tmp90_ = FALSE;
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp90_ = display_options;
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = _tmp90_;
-#line 14445 "Dialogs.c"
+#line 14126 "Dialogs.c"
 	} else {
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = FALSE;
-#line 14449 "Dialogs.c"
+#line 14130 "Dialogs.c"
 	}
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp91_ = self->priv->modify_originals_check_button;
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp85_);
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp93_ = only_video;
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp93_) {
-#line 14459 "Dialogs.c"
+#line 14140 "Dialogs.c"
 		gboolean _tmp94_ = FALSE;
 		ConfigFacade* _tmp95_ = NULL;
 		ConfigFacade* _tmp96_ = NULL;
 		gboolean _tmp97_ = FALSE;
 		gboolean _tmp98_ = FALSE;
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp95_ = config_facade_get_instance ();
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp96_ = _tmp95_;
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp97_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp98_ = !_tmp97_;
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp96_);
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp98_) {
-#line 14477 "Dialogs.c"
+#line 14158 "Dialogs.c"
 			gboolean _tmp99_ = FALSE;
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp99_ = display_options;
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp94_ = _tmp99_;
-#line 14483 "Dialogs.c"
+#line 14164 "Dialogs.c"
 		} else {
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp94_ = FALSE;
-#line 14487 "Dialogs.c"
+#line 14168 "Dialogs.c"
 		}
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = _tmp94_;
-#line 14491 "Dialogs.c"
+#line 14172 "Dialogs.c"
 	} else {
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = FALSE;
-#line 14495 "Dialogs.c"
+#line 14176 "Dialogs.c"
 	}
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp100_ = self->priv->modify_originals_check_button;
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget), _tmp92_);
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp101_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp101_);
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time_content = _tmp101_;
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp102_ = time_content;
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp103_ = self->priv->calendar;
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp102_, G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp104_ = time_content;
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp105_ = clock;
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp104_, G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp106_ = display_options;
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp106_) {
-#line 14523 "Dialogs.c"
+#line 14204 "Dialogs.c"
 		GtkBox* _tmp107_ = NULL;
 		GtkRadioButton* _tmp108_ = NULL;
 		GtkBox* _tmp109_ = NULL;
 		GtkRadioButton* _tmp110_ = NULL;
 		GtkBox* _tmp111_ = NULL;
 		GtkCheckButton* _tmp112_ = NULL;
-#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp107_ = time_content;
-#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp108_ = self->priv->relativity_radio_button;
-#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_start (_tmp107_, G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp109_ = time_content;
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp110_ = self->priv->batch_radio_button;
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_start (_tmp109_, G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp111_ = time_content;
-#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp112_ = self->priv->modify_originals_check_button;
-#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_start (_tmp111_, G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 14548 "Dialogs.c"
+#line 14229 "Dialogs.c"
 	}
-#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preview = NULL;
-#line 14552 "Dialogs.c"
+#line 14233 "Dialogs.c"
 	{
 		GdkPixbuf* _tmp113_ = NULL;
 		Dateable* _tmp114_ = NULL;
 		GdkPixbuf* _tmp115_ = NULL;
 		GdkPixbuf* _tmp116_ = NULL;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp114_ = source;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp115_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE, &_inner_error_);
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp113_ = _tmp115_;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14566 "Dialogs.c"
+#line 14247 "Dialogs.c"
 			goto __catch422_g_error;
 		}
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp116_ = _tmp113_;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp113_ = NULL;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (preview);
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preview = _tmp116_;
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp113_);
-#line 14579 "Dialogs.c"
+#line 14260 "Dialogs.c"
 	}
 	goto __finally422;
 	__catch422_g_error:
@@ -14599,235 +14280,235 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 		Dateable* _tmp117_ = NULL;
 		gchar* _tmp118_ = NULL;
 		gchar* _tmp119_ = NULL;
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		err = _inner_error_;
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_inner_error_ = NULL;
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp117_ = source;
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp118_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_DATA_OBJECT, DataObject));
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp119_ = _tmp118_;
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_warning ("Dialogs.vala:1765: Unable to fetch preview for %s", _tmp119_);
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		g_warning ("Dialogs.vala:1755: Unable to fetch preview for %s", _tmp119_);
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp119_);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_error_free0 (err);
-#line 14604 "Dialogs.c"
+#line 14285 "Dialogs.c"
 	}
 	__finally422:
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (preview);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (time_content);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (clock);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/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 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_clear_error (&_inner_error_);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return NULL;
-#line 14621 "Dialogs.c"
+#line 14302 "Dialogs.c"
 	}
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp120_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp120_);
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	image_content = _tmp120_;
-#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp121_ = image_content;
-#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp122_ = image_content;
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_set_homogeneous (_tmp122_, TRUE);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp124_ = preview;
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp124_ != NULL) {
-#line 14641 "Dialogs.c"
+#line 14322 "Dialogs.c"
 		GdkPixbuf* _tmp125_ = NULL;
 		GtkImage* _tmp126_ = NULL;
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp125_ = preview;
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp126_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp125_);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp126_);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp123_);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = _tmp126_;
-#line 14654 "Dialogs.c"
+#line 14335 "Dialogs.c"
 	} else {
 		GtkImage* _tmp127_ = NULL;
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp127_ = (GtkImage*) gtk_image_new ();
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp127_);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp123_);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = _tmp127_;
-#line 14665 "Dialogs.c"
+#line 14346 "Dialogs.c"
 	}
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp128_ = _g_object_ref0 (_tmp123_);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	image = _tmp128_;
-#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp129_ = (GtkLabel*) gtk_label_new (NULL);
-#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp129_);
-#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->original_time_label);
-#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->original_time_label = _tmp129_;
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp130_ = image_content;
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp131_ = image;
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp130_, G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp132_ = image_content;
-#line 1774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp133_ = self->priv->original_time_label;
-#line 1774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp132_, G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp134_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp134_);
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	hbox = _tmp134_;
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp135_ = hbox;
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_container_get_type (), GtkContainer), (guint) 3);
-#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp136_ = hbox;
-#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp137_ = image_content;
-#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp136_, G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp138_ = hbox;
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp139_ = time_content;
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp138_, G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp140_ = hbox;
-#line 1780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp140_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp141_ = hbox;
-#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1782 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp142_ = hbox;
-#line 1782 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp143_ = hbox;
-#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp144_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp145_ = hbox;
-#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp145_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp146_ = (GtkLabel*) gtk_label_new ("");
-#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp146_);
-#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->notification);
-#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->notification = _tmp146_;
-#line 1788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp147_ = self->priv->notification;
-#line 1788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_line_wrap (_tmp147_, TRUE);
-#line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp148_ = self->priv->notification;
-#line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_justify (_tmp148_, GTK_JUSTIFY_CENTER);
-#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp149_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp150_ = self->priv->notification;
-#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp149_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp150_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp151_ = source;
-#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp152_ = dateable_get_exposure_time (_tmp151_);
-#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->original_time = _tmp152_;
-#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp153_ = self->priv->original_time;
-#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp153_ == ((time_t) 0)) {
-#line 14767 "Dialogs.c"
+#line 14448 "Dialogs.c"
 		time_t _tmp154_ = 0;
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp154_ = time (NULL);
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->original_time = _tmp154_;
-#line 1797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->no_original_time = TRUE;
-#line 14775 "Dialogs.c"
+#line 14456 "Dialogs.c"
 	}
-#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp155_ = self->priv->original_time;
-#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_time_local (_tmp155_, &_tmp156_);
-#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_set_time (self, &_tmp156_);
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp157_ = config_facade_get_instance ();
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp158_ = _tmp157_;
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp159_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_set_original_time_label (self, _tmp159_);
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp158_);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (hbox);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp123_);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image_content);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (preview);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (time_content);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (clock);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 14809 "Dialogs.c"
+#line 14490 "Dialogs.c"
 }
 
 
 AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) {
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return adjust_date_time_dialog_construct (TYPE_ADJUST_DATE_TIME_DIALOG, source, photo_count, display_options, contains_video, only_video);
-#line 14816 "Dialogs.c"
+#line 14497 "Dialogs.c"
 }
 
 
@@ -14852,60 +14533,60 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
 	gint _tmp31_ = 0;
 	GtkComboBoxText* _tmp32_ = NULL;
 	gint _tmp33_ = 0;
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (time != NULL);
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->calendar;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = *time;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_.tm_mon;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = *time;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_.tm_year;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_calendar_select_month (_tmp0_, (guint) _tmp2_, (guint) (_tmp4_ + ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET));
-#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->calendar;
-#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = *time;
-#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_.tm_mday;
-#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_calendar_select_day (_tmp5_, (guint) _tmp7_);
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp9_);
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_) {
-#line 14877 "Dialogs.c"
+#line 14558 "Dialogs.c"
 		GtkComboBoxText* _tmp12_ = NULL;
 		GtkSpinButton* _tmp13_ = NULL;
 		struct tm _tmp14_ = {0};
 		gint _tmp15_ = 0;
-#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->system;
-#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), (gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->hour;
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = *time;
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _tmp14_.tm_hour;
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp13_, (gdouble) _tmp15_);
-#line 14894 "Dialogs.c"
+#line 14575 "Dialogs.c"
 	} else {
 		gint AMPM_hour = 0;
 		struct tm _tmp16_ = {0};
@@ -14917,74 +14598,74 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
 		struct tm _tmp23_ = {0};
 		gint _tmp24_ = 0;
 		GtkComboBoxText* _tmp25_ = NULL;
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = *time;
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_.tm_hour;
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		AMPM_hour = _tmp17_ % 12;
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = AMPM_hour;
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp19_ == 0) {
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = 12;
-#line 14918 "Dialogs.c"
+#line 14599 "Dialogs.c"
 		} else {
 			gint _tmp20_ = 0;
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = AMPM_hour;
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = _tmp20_;
-#line 14925 "Dialogs.c"
+#line 14606 "Dialogs.c"
 		}
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->hour;
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp21_, (gdouble) _tmp18_);
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = *time;
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = _tmp23_.tm_hour;
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp24_ >= 12) {
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM;
-#line 14939 "Dialogs.c"
+#line 14620 "Dialogs.c"
 		} else {
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM;
-#line 14943 "Dialogs.c"
+#line 14624 "Dialogs.c"
 		}
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = self->priv->system;
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp22_);
-#line 14949 "Dialogs.c"
+#line 14630 "Dialogs.c"
 	}
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = self->priv->minute;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = *time;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = _tmp27_.tm_min;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp28_);
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->second;
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = *time;
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = _tmp30_.tm_sec;
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_spin_button_set_value (_tmp29_, (gdouble) _tmp31_);
-#line 1820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = self->priv->system;
-#line 1820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp33_;
-#line 14973 "Dialogs.c"
+#line 14654 "Dialogs.c"
 }
 
 
@@ -15000,37 +14681,37 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 15019 "Dialogs.c"
+#line 14700 "Dialogs.c"
 }
 
 
@@ -15046,58 +14727,58 @@ static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialo
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
 	gchar* _tmp12_ = NULL;
-#line 1823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->no_original_time;
-#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 1825 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 15043 "Dialogs.c"
+#line 14724 "Dialogs.c"
 	}
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_24_hr_format;
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 15049 "Dialogs.c"
+#line 14730 "Dialogs.c"
 		const gchar* _tmp3_ = NULL;
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _ ("%m/%d/%Y, %H:%M:%S");
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp3_;
-#line 15055 "Dialogs.c"
+#line 14736 "Dialogs.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1819 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _ ("%m/%d/%Y, %I:%M:%S %p");
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1819 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp4_;
-#line 15062 "Dialogs.c"
+#line 14743 "Dialogs.c"
 	}
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->original_time_label;
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("Original: ");
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->original_time;
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_time_local (_tmp7_, &_tmp8_);
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = g_time_format (&_tmp8_, _tmp1_);
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = g_strconcat (_tmp6_, _tmp10_, NULL);
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_;
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_text (_tmp5_, _tmp12_);
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp12_);
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 15086 "Dialogs.c"
+#line 14767 "Dialogs.c"
 }
 
 
@@ -15126,105 +14807,105 @@ static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) {
 	guint _tmp18_ = 0U;
 	guint _tmp19_ = 0U;
 	time_t _tmp20_ = 0;
-#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), 0);
-#line 1833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	memset (&time, 0, sizeof (struct tm));
-#line 1835 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->second;
-#line 1835 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_spin_button_get_value (_tmp0_);
-#line 1835 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_sec = (gint) _tmp1_;
-#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->minute;
-#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_spin_button_get_value (_tmp2_);
-#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_min = (gint) _tmp3_;
-#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = self->priv->hour;
-#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = gtk_spin_button_get_value (_tmp4_);
-#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	hour = (gint) _tmp5_;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = hour;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ == 12) {
-#line 15141 "Dialogs.c"
+#line 14822 "Dialogs.c"
 		GtkComboBoxText* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->system;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp10_ != ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
-#line 15150 "Dialogs.c"
+#line 14831 "Dialogs.c"
 	} else {
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = FALSE;
-#line 15154 "Dialogs.c"
+#line 14835 "Dialogs.c"
 	}
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp7_) {
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = 0;
-#line 15160 "Dialogs.c"
+#line 14841 "Dialogs.c"
 	} else {
 		gint _tmp11_ = 0;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = hour;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _tmp11_;
-#line 15167 "Dialogs.c"
+#line 14848 "Dialogs.c"
 	}
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_hour = _tmp6_;
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = self->priv->system;
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM)) {
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = 12;
-#line 15179 "Dialogs.c"
+#line 14860 "Dialogs.c"
 	} else {
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = 0;
-#line 15183 "Dialogs.c"
+#line 14864 "Dialogs.c"
 	}
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = time.tm_hour;
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_hour = _tmp15_ + _tmp12_;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->calendar;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_calendar_get_date (_tmp16_, &_tmp17_, &_tmp18_, &_tmp19_);
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	year = _tmp17_;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	month = _tmp18_;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	day = _tmp19_;
-#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_year = ((gint) year) - ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET;
-#line 1846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_mon = (gint) month;
-#line 1847 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1837 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_mday = (gint) day;
-#line 1849 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_isdst = -1;
-#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = mktime (&time);
-#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp20_;
-#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15213 "Dialogs.c"
+#line 14894 "Dialogs.c"
 }
 
 
@@ -15235,17 +14916,17 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 	gboolean result = FALSE;
 	gboolean response = FALSE;
 	gint _tmp0_ = 0;
-#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
-#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	response = FALSE;
-#line 1860 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1860 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 15234 "Dialogs.c"
+#line 14915 "Dialogs.c"
 		gboolean _tmp1_ = FALSE;
 		GtkRadioButton* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
@@ -15257,125 +14938,125 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 		GtkCheckButton* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
 		gboolean _tmp17_ = FALSE;
-#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->no_original_time;
-#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp1_) {
-#line 15250 "Dialogs.c"
+#line 14931 "Dialogs.c"
 			time_t _tmp2_ = 0;
-#line 1862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = adjust_date_time_dialog_get_time (self);
-#line 1862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_time_shift = (gint64) _tmp2_;
-#line 15256 "Dialogs.c"
+#line 14937 "Dialogs.c"
 		} else {
 			time_t _tmp3_ = 0;
 			time_t _tmp4_ = 0;
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = adjust_date_time_dialog_get_time (self);
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = self->priv->original_time;
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_time_shift = (gint64) (_tmp3_ - _tmp4_);
-#line 15266 "Dialogs.c"
+#line 14947 "Dialogs.c"
 		}
-#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->relativity_radio_button;
-#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_keep_relativity = _tmp6_;
-#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->relativity_radio_button;
-#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = _tmp8_;
-#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_) {
-#line 15282 "Dialogs.c"
+#line 14963 "Dialogs.c"
 			ConfigFacade* _tmp10_ = NULL;
 			ConfigFacade* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
-#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = config_facade_get_instance ();
-#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = _tmp10_;
-#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = _vala_keep_relativity;
-#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			configuration_facade_set_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
-#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_tmp11_);
-#line 15296 "Dialogs.c"
+#line 14977 "Dialogs.c"
 		}
-#line 1871 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->modify_originals_check_button;
-#line 1871 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1871 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_modify_originals = _tmp14_;
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->modify_originals_check_button;
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_;
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp17_) {
-#line 15312 "Dialogs.c"
+#line 14993 "Dialogs.c"
 			ConfigFacade* _tmp18_ = NULL;
 			ConfigFacade* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = config_facade_get_instance ();
-#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp19_ = _tmp18_;
-#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = _vala_modify_originals;
-#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			configuration_facade_set_modify_originals (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp20_);
-#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_tmp19_);
-#line 15326 "Dialogs.c"
+#line 15007 "Dialogs.c"
 		}
-#line 1876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		response = TRUE;
-#line 15330 "Dialogs.c"
+#line 15011 "Dialogs.c"
 	} else {
-#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_time_shift = (gint64) 0;
-#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_keep_relativity = TRUE;
-#line 1880 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_modify_originals = FALSE;
-#line 15338 "Dialogs.c"
+#line 15019 "Dialogs.c"
 	}
-#line 1883 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = response;
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (time_shift) {
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*time_shift = _vala_time_shift;
-#line 15348 "Dialogs.c"
+#line 15029 "Dialogs.c"
 	}
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (keep_relativity) {
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*keep_relativity = _vala_keep_relativity;
-#line 15354 "Dialogs.c"
+#line 15035 "Dialogs.c"
 	}
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (modify_originals) {
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*modify_originals = _vala_modify_originals;
-#line 15360 "Dialogs.c"
+#line 15041 "Dialogs.c"
 	}
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15364 "Dialogs.c"
+#line 15045 "Dialogs.c"
 }
 
 
@@ -15386,31 +15067,31 @@ static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDia
 	gdouble _tmp2_ = 0.0;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 1888 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
-#line 1888 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (button), FALSE);
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = button;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = button;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_spin_button_get_value (_tmp1_);
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup_printf ("%02d", (gint) _tmp2_);
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry), _tmp4_);
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp4_);
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed (self);
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15399 "Dialogs.c"
+#line 15080 "Dialogs.c"
 }
 
 
@@ -15423,81 +15104,81 @@ static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self)
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
 	gint64 _tmp6_ = 0LL;
-#line 1896 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = adjust_date_time_dialog_get_time (self);
-#line 1897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->original_time;
-#line 1897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time_shift = ((gint64) _tmp0_) - ((gint64) _tmp1_);
-#line 1899 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->system;
-#line 1899 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1899 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp3_;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = time_shift;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_ == ((gint64) 0)) {
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = TRUE;
-#line 15432 "Dialogs.c"
+#line 15113 "Dialogs.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->no_original_time;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp7_;
-#line 15439 "Dialogs.c"
+#line 15120 "Dialogs.c"
 	}
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = TRUE;
-#line 15445 "Dialogs.c"
+#line 15126 "Dialogs.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
 		GtkRadioButton* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->batch_radio_button;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp10_) {
-#line 15456 "Dialogs.c"
+#line 15137 "Dialogs.c"
 			GtkRadioButton* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			gboolean _tmp13_ = FALSE;
-#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = self->priv->batch_radio_button;
-#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = _tmp12_;
-#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _tmp13_;
-#line 15468 "Dialogs.c"
+#line 15149 "Dialogs.c"
 		} else {
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = FALSE;
-#line 15472 "Dialogs.c"
+#line 15153 "Dialogs.c"
 		}
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp8_;
-#line 15476 "Dialogs.c"
+#line 15157 "Dialogs.c"
 	}
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 15480 "Dialogs.c"
+#line 15161 "Dialogs.c"
 		GtkLabel* _tmp14_ = NULL;
-#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = self->priv->notification;
-#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 15486 "Dialogs.c"
+#line 15167 "Dialogs.c"
 	} else {
 		gboolean forward = FALSE;
 		gint64 _tmp15_ = 0LL;
@@ -15534,108 +15215,108 @@ static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self)
 		gchar* _tmp43_ = NULL;
 		gchar* _tmp44_ = NULL;
 		GtkLabel* _tmp45_ = NULL;
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = time_shift;
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		forward = _tmp15_ > ((gint64) 0);
-#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = time_shift;
-#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = llabs (_tmp16_);
-#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time_shift = _tmp17_;
-#line 1910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = time_shift;
-#line 1910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		days = (gint) (_tmp18_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY);
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = time_shift;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time_shift = _tmp19_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY;
-#line 1912 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = time_shift;
-#line 1912 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		hours = (gint) (_tmp20_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR);
-#line 1913 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = time_shift;
-#line 1913 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time_shift = _tmp21_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR;
-#line 1914 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = time_shift;
-#line 1914 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		minutes = (gint) (_tmp22_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
-#line 1915 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = time_shift;
-#line 1915 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		seconds = (gint) (_tmp23_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
-#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = forward;
-#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp25_) {
-#line 15561 "Dialogs.c"
+#line 15242 "Dialogs.c"
 			const gchar* _tmp26_ = NULL;
-#line 1918 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = _ ("Exposure time will be shifted forward by\n" \
 "%d %s, %d %s, %d %s, and %d %s.");
-#line 1918 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = _tmp26_;
-#line 15567 "Dialogs.c"
+#line 15248 "Dialogs.c"
 		} else {
 			const gchar* _tmp27_ = NULL;
-#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = _ ("Exposure time will be shifted backward by\n" \
 "%d %s, %d %s, %d %s, and %d %s.");
-#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = _tmp27_;
-#line 15574 "Dialogs.c"
+#line 15255 "Dialogs.c"
 		}
-#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = g_strdup (_tmp24_);
-#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		shift_status = _tmp28_;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = self->priv->notification;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = shift_status;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = days;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = days;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = ngettext ("day", "days", (gulong) _tmp32_);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = hours;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = hours;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp36_ = ngettext ("hour", "hours", (gulong) _tmp35_);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp37_ = minutes;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp38_ = minutes;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp39_ = ngettext ("minute", "minutes", (gulong) _tmp38_);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp40_ = seconds;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp41_ = seconds;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp42_ = ngettext ("second", "seconds", (gulong) _tmp41_);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp43_ = g_strdup_printf (_tmp30_, _tmp31_, _tmp33_, _tmp34_, _tmp36_, _tmp37_, _tmp39_, _tmp40_, _tmp42_);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp44_ = _tmp43_;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_text (_tmp29_, _tmp44_);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp44_);
-#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp45_ = self->priv->notification;
-#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (shift_status);
-#line 15622 "Dialogs.c"
+#line 15303 "Dialogs.c"
 	}
 }
 
@@ -15650,39 +15331,39 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 	gint _tmp6_ = 0;
 	GtkComboBoxText* _tmp7_ = NULL;
 	gint _tmp8_ = 0;
-#line 1930 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->previous_time_system;
-#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->system;
-#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == _tmp2_) {
-#line 1932 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 15649 "Dialogs.c"
+#line 15330 "Dialogs.c"
 	}
-#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = config_facade_get_instance ();
-#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->system;
-#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR));
-#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1936 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->system;
-#line 1936 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1936 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR)) {
-#line 15669 "Dialogs.c"
+#line 15350 "Dialogs.c"
 		gint _tmp9_ = 0;
 		GtkSpinButton* _tmp10_ = NULL;
 		gdouble _tmp11_ = 0.0;
@@ -15693,57 +15374,57 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 		GtkSpinButton* _tmp17_ = NULL;
 		GtkSpinButton* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->hour;
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = gtk_spin_button_get_value (_tmp10_);
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp11_ == 12.0) {
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = 0;
-#line 15688 "Dialogs.c"
+#line 15369 "Dialogs.c"
 		} else {
 			GtkSpinButton* _tmp12_ = NULL;
 			gdouble _tmp13_ = 0.0;
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = self->priv->hour;
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = gtk_spin_button_get_value (_tmp12_);
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = (gint) _tmp13_;
-#line 15698 "Dialogs.c"
+#line 15379 "Dialogs.c"
 		}
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time = _tmp9_;
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->previous_time_system;
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp15_ == ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM) {
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = 12;
-#line 15708 "Dialogs.c"
+#line 15389 "Dialogs.c"
 		} else {
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = 0;
-#line 15712 "Dialogs.c"
+#line 15393 "Dialogs.c"
 		}
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = time;
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time = _tmp16_ + _tmp14_;
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = self->priv->hour;
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_range (_tmp17_, (gdouble) 0, (gdouble) 23);
-#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		adjust_date_time_dialog_set_original_time_label (self, TRUE);
-#line 1943 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->hour;
-#line 1943 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = time;
-#line 1943 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp18_, (gdouble) _tmp19_);
-#line 15730 "Dialogs.c"
+#line 15411 "Dialogs.c"
 	} else {
 		gint AMPM_hour = 0;
 		GtkSpinButton* _tmp20_ = NULL;
@@ -15752,92 +15433,92 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
 		GtkSpinButton* _tmp26_ = NULL;
-#line 1945 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = self->priv->hour;
-#line 1945 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = gtk_spin_button_get_value (_tmp20_);
-#line 1945 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		AMPM_hour = ((gint) _tmp21_) % 12;
-#line 1947 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = self->priv->hour;
-#line 1947 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_range (_tmp22_, (gdouble) 1, (gdouble) 12);
-#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		adjust_date_time_dialog_set_original_time_label (self, FALSE);
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = AMPM_hour;
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp24_ == 0) {
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = 12;
-#line 15757 "Dialogs.c"
+#line 15438 "Dialogs.c"
 		} else {
 			gint _tmp25_ = 0;
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = AMPM_hour;
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = _tmp25_;
-#line 15764 "Dialogs.c"
+#line 15445 "Dialogs.c"
 		}
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = self->priv->hour;
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp23_);
-#line 15770 "Dialogs.c"
+#line 15451 "Dialogs.c"
 	}
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed (self);
-#line 15774 "Dialogs.c"
+#line 15455 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_class_init (AdjustDateTimeDialogClass * klass) {
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (AdjustDateTimeDialogPrivate));
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_date_time_dialog_finalize;
-#line 15785 "Dialogs.c"
+#line 15466 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_instance_init (AdjustDateTimeDialog * self) {
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = ADJUST_DATE_TIME_DIALOG_GET_PRIVATE (self);
-#line 1641 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->no_original_time = FALSE;
-#line 15794 "Dialogs.c"
+#line 15475 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_finalize (GObject* obj) {
 	AdjustDateTimeDialog * self;
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialog);
-#line 1646 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->original_time_label);
-#line 1647 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->calendar);
-#line 1648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->hour);
-#line 1649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->minute);
-#line 1650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->second);
-#line 1651 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->system);
-#line 1652 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->relativity_radio_button);
-#line 1653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->batch_radio_button);
-#line 1654 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->notification);
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (adjust_date_time_dialog_parent_class)->finalize (obj);
-#line 15824 "Dialogs.c"
+#line 15505 "Dialogs.c"
 }
 
 
@@ -15869,31 +15550,31 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 	GtkMessageDialog* _tmp34_ = NULL;
 	GtkMessageDialog* _tmp35_ = NULL;
 	const gchar* _tmp36_ = NULL;
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_ARRAY_LIST (objects));
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (message != NULL);
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (title != NULL);
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = message;
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strconcat (_tmp0_, "\n", NULL);
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog_message = _tmp1_;
-#line 15868 "Dialogs.c"
+#line 15549 "Dialogs.c"
 	{
 		gint i = 0;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 15873 "Dialogs.c"
+#line 15554 "Dialogs.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = TRUE;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 15880 "Dialogs.c"
+#line 15561 "Dialogs.c"
 				gboolean _tmp4_ = FALSE;
 				gint _tmp5_ = 0;
 				const gchar* _tmp10_ = NULL;
@@ -15906,96 +15587,96 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 				gchar* _tmp17_ = NULL;
 				gchar* _tmp18_ = NULL;
 				gchar* _tmp19_ = NULL;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp2_) {
-#line 15895 "Dialogs.c"
+#line 15576 "Dialogs.c"
 					gint _tmp3_ = 0;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp3_ = i;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					i = _tmp3_ + 1;
-#line 15901 "Dialogs.c"
+#line 15582 "Dialogs.c"
 				}
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp2_ = FALSE;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp5_ = i;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp5_ < MAX_OBJECTS_DISPLAYED) {
-#line 15909 "Dialogs.c"
+#line 15590 "Dialogs.c"
 					GeeArrayList* _tmp6_ = NULL;
 					gint _tmp7_ = 0;
 					gint _tmp8_ = 0;
 					gint _tmp9_ = 0;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = objects;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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));
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp8_ = _tmp7_;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp9_ = i;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp4_ = _tmp8_ > _tmp9_;
-#line 15924 "Dialogs.c"
+#line 15605 "Dialogs.c"
 				} else {
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp4_ = FALSE;
-#line 15928 "Dialogs.c"
+#line 15609 "Dialogs.c"
 				}
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp4_) {
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 15934 "Dialogs.c"
+#line 15615 "Dialogs.c"
 				}
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = dialog_message;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = objects;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = i;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp12_);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp14_ = (DataObject*) _tmp13_;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp15_ = data_object_to_string (_tmp14_);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp16_ = _tmp15_;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp17_ = g_strconcat ("\n", _tmp16_, NULL);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp18_ = _tmp17_;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp19_ = g_strconcat (_tmp10_, _tmp18_, NULL);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (dialog_message);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				dialog_message = _tmp19_;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp18_);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp16_);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp14_);
-#line 15966 "Dialogs.c"
+#line 15647 "Dialogs.c"
 			}
 		}
 	}
-#line 1966 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = objects;
-#line 1966 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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));
-#line 1966 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
-#line 1966 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	remainder = _tmp22_ - MAX_OBJECTS_DISPLAYED;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = remainder;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ > 0) {
-#line 15982 "Dialogs.c"
+#line 15663 "Dialogs.c"
 		const gchar* _tmp24_ = NULL;
 		gint _tmp25_ = 0;
 		const gchar* _tmp26_ = NULL;
@@ -16003,57 +15684,57 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 		gchar* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = dialog_message;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = remainder;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = ngettext ("\n\nAnd %d other.", "\n\nAnd %d others.", (gulong) _tmp25_);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = remainder;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = g_strdup_printf (_tmp26_, _tmp27_);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = _tmp28_;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = g_strconcat (_tmp24_, _tmp29_, NULL);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (dialog_message);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog_message = _tmp30_;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp29_);
-#line 16010 "Dialogs.c"
+#line 15691 "Dialogs.c"
 	}
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = app_window_get_instance ();
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = _tmp31_;
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = dialog_message;
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp33_);
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp34_);
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = _tmp34_;
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp32_);
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp35_;
-#line 1975 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = title;
-#line 1975 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _tmp36_);
-#line 1977 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (dialog_message);
-#line 16040 "Dialogs.c"
+#line 15721 "Dialogs.c"
 }
 
 
@@ -16066,40 +15747,40 @@ TagsDialog* tags_dialog_construct (GType object_type, const gchar* title, const
 	HierarchicalTagIndex* _tmp4_ = NULL;
 	GeeCollection* _tmp5_ = NULL;
 	GeeCollection* _tmp6_ = NULL;
-#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (label != NULL, NULL);
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = title;
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = label;
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = initial_text;
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = hierarchical_tag_index_get_global_index ();
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = hierarchical_tag_index_get_all_tags (_tmp4_);
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_;
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (TagsDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp6_, ",");
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_hierarchical_tag_index_unref0 (_tmp4_);
-#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 16079 "Dialogs.c"
+#line 15760 "Dialogs.c"
 }
 
 
 static void tags_dialog_class_init (TagsDialogClass * klass) {
-#line 1981 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 16086 "Dialogs.c"
+#line 15767 "Dialogs.c"
 }
 
 
@@ -16125,28 +15806,28 @@ AddTagsDialog* add_tags_dialog_construct (GType object_type) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_dpgettext2 (NULL, "Dialog Title", RESOURCES_ADD_TAGS_TITLE);
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	title = _tmp1_;
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _ ("Tags (separated by commas):");
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (AddTagsDialog*) tags_dialog_construct (object_type, title, _tmp2_, NULL);
-#line 1989 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (title);
-#line 1989 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 16126 "Dialogs.c"
+#line 15807 "Dialogs.c"
 }
 
 
 AddTagsDialog* add_tags_dialog_new (void) {
-#line 1989 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return add_tags_dialog_construct (TYPE_ADD_TAGS_DIALOG);
-#line 16133 "Dialogs.c"
+#line 15814 "Dialogs.c"
 }
 
 
@@ -16166,70 +15847,70 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) {
 	gint _tmp9__length1 = 0;
 	gchar** _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 1995 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADD_TAGS_DIALOG (self), NULL);
-#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = _tmp0_;
-#line 1997 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 1997 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == NULL) {
-#line 16163 "Dialogs.c"
+#line 15844 "Dialogs.c"
 		gchar** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = NULL;
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2__length1 = 0;
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (result_length1) {
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			*result_length1 = _tmp2__length1;
-#line 16174 "Dialogs.c"
+#line 15855 "Dialogs.c"
 		}
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp2_;
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16182 "Dialogs.c"
+#line 15863 "Dialogs.c"
 	}
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = text;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ",", 0);
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6__length1 = _vala_array_length (_tmp4_);
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = tag_prep_tag_names (_tmp6_, _vala_array_length (_tmp4_), &_tmp7_);
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9__length1 = _tmp7_;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10__length1 = _tmp9__length1;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (result_length1) {
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*result_length1 = _tmp10__length1;
-#line 16208 "Dialogs.c"
+#line 15889 "Dialogs.c"
 	}
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp10_;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16216 "Dialogs.c"
+#line 15897 "Dialogs.c"
 }
 
 
@@ -16252,64 +15933,64 @@ static gboolean add_tags_dialog_real_on_modify_validate (TextEntryDialogMediator
 	gint _names_size_ = 0;
 	gchar** _tmp9_ = NULL;
 	gint _tmp9__length1 = 0;
-#line 2005 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_DIALOG, AddTagsDialog);
-#line 2005 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = text;
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = string_contains (_tmp0_, TAG_PATH_SEPARATOR_STRING);
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16253 "Dialogs.c"
+#line 15934 "Dialogs.c"
 	}
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = text;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_ = g_strsplit (_tmp2_, ",", 0);
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5__length1 = _vala_array_length (_tmp3_);
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = tag_prep_tag_names (_tmp5_, _vala_array_length (_tmp3_), &_tmp6_);
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8__length1 = _tmp6_;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) g_free), NULL);
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names = _tmp8_;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names_length1 = _tmp8__length1;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_names_size_ = names_length1;
-#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = names;
-#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9__length1 = names_length1;
-#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp9__length1 > 0;
-#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16287 "Dialogs.c"
+#line 15968 "Dialogs.c"
 }
 
 
 static void add_tags_dialog_class_init (AddTagsDialogClass * klass) {
-#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	add_tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = add_tags_dialog_real_on_modify_validate;
-#line 16296 "Dialogs.c"
+#line 15977 "Dialogs.c"
 }
 
 
@@ -16335,30 +16016,30 @@ ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, MediaSource*
 	MediaSource* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2008 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _ ("Tags (separated by commas):");
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = source;
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = modify_tags_dialog_get_initial_text (_tmp1_);
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ModifyTagsDialog*) tags_dialog_construct (object_type, RESOURCES_MODIFY_TAGS_LABEL, _tmp0_, _tmp3_);
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp3_);
-#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2008 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 16338 "Dialogs.c"
+#line 16019 "Dialogs.c"
 }
 
 
 ModifyTagsDialog* modify_tags_dialog_new (MediaSource* source) {
-#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2008 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return modify_tags_dialog_construct (TYPE_MODIFY_TAGS_DIALOG, source);
-#line 16345 "Dialogs.c"
+#line 16026 "Dialogs.c"
 }
 
 
@@ -16375,52 +16056,52 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 	GeeSortedSet* tag_basenames = NULL;
 	GeeTreeSet* _tmp6_ = NULL;
 	gchar* text = NULL;
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
-#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = tag_global;
-#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = source;
-#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = tag_source_collection_fetch_for_source (_tmp0_, _tmp1_);
-#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	source_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = source_tags;
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == NULL) {
-#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = NULL;
-#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (source_tags);
-#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16382 "Dialogs.c"
+#line 16063 "Dialogs.c"
 	}
-#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = source_tags;
-#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = tag_get_terminal_tags (_tmp4_);
-#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	terminal_tags = _tmp5_;
-#line 2030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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);
-#line 2030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_basenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 16394 "Dialogs.c"
+#line 16075 "Dialogs.c"
 	{
 		GeeIterator* _tag_it = NULL;
 		GeeCollection* _tmp7_ = NULL;
 		GeeIterator* _tmp8_ = NULL;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = terminal_tags;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tag_it = _tmp8_;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 16407 "Dialogs.c"
+#line 16088 "Dialogs.c"
 			GeeIterator* _tmp9_ = NULL;
 			gboolean _tmp10_ = FALSE;
 			Tag* tag = NULL;
@@ -16432,64 +16113,64 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = _tag_it;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = gee_iterator_next (_tmp9_);
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp10_) {
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 16427 "Dialogs.c"
+#line 16108 "Dialogs.c"
 			}
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = _tag_it;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = gee_iterator_get (_tmp11_);
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			tag = (Tag*) _tmp12_;
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = tag_basenames;
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = tag;
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = tag_get_path (_tmp14_);
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp16_ = _tmp15_;
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp17_ = hierarchical_tag_utilities_get_basename (_tmp16_);
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = _tmp17_;
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_);
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp18_);
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp16_);
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (tag);
-#line 16455 "Dialogs.c"
+#line 16136 "Dialogs.c"
 		}
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tag_it);
-#line 16459 "Dialogs.c"
+#line 16140 "Dialogs.c"
 	}
-#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 16463 "Dialogs.c"
+#line 16144 "Dialogs.c"
 	{
 		GeeIterator* _name_it = NULL;
 		GeeSortedSet* _tmp19_ = NULL;
 		GeeIterator* _tmp20_ = NULL;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = tag_basenames;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_name_it = _tmp20_;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 16476 "Dialogs.c"
+#line 16157 "Dialogs.c"
 			GeeIterator* _tmp21_ = NULL;
 			gboolean _tmp22_ = FALSE;
 			gchar* name = NULL;
@@ -16499,77 +16180,77 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			const gchar* _tmp29_ = NULL;
 			const gchar* _tmp30_ = NULL;
 			gchar* _tmp31_ = NULL;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = _name_it;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = gee_iterator_next (_tmp21_);
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp22_) {
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 16494 "Dialogs.c"
+#line 16175 "Dialogs.c"
 			}
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = _name_it;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = gee_iterator_get (_tmp23_);
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			name = (gchar*) _tmp24_;
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = text;
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp25_ == NULL) {
-#line 16506 "Dialogs.c"
+#line 16187 "Dialogs.c"
 				gchar* _tmp26_ = NULL;
-#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = g_strdup ("");
-#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp26_;
-#line 16514 "Dialogs.c"
+#line 16195 "Dialogs.c"
 			} else {
 				const gchar* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = text;
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp28_ = g_strconcat (_tmp27_, ", ", NULL);
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp28_;
-#line 16526 "Dialogs.c"
+#line 16207 "Dialogs.c"
 			}
-#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = text;
-#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = name;
-#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = g_strconcat (_tmp29_, _tmp30_, NULL);
-#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (text);
-#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			text = _tmp31_;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (name);
-#line 16540 "Dialogs.c"
+#line 16221 "Dialogs.c"
 		}
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_name_it);
-#line 16544 "Dialogs.c"
+#line 16225 "Dialogs.c"
 	}
-#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
-#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (tag_basenames);
-#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (terminal_tags);
-#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (source_tags);
-#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16556 "Dialogs.c"
+#line 16237 "Dialogs.c"
 }
 
 
@@ -16602,140 +16283,140 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) {
 	gchar** _tmp16_ = NULL;
 	gchar** _tmp17_ = NULL;
 	gint _tmp17__length1 = 0;
-#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MODIFY_TAGS_DIALOG (self), NULL);
-#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = _tmp0_;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == NULL) {
-#line 2050 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = NULL;
-#line 2050 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 2050 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16605 "Dialogs.c"
+#line 16286 "Dialogs.c"
 	}
-#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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);
-#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	new_tags = _tmp2_;
-#line 2055 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = text;
-#line 2055 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = is_string_empty (_tmp3_);
-#line 2055 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = new_tags;
-#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16623 "Dialogs.c"
+#line 16304 "Dialogs.c"
 	}
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = text;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_ = g_strsplit (_tmp5_, ",", 0);
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8__length1 = _vala_array_length (_tmp6_);
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = tag_prep_tag_names (_tmp8_, _vala_array_length (_tmp6_), &_tmp9_);
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11__length1 = _tmp9_;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL);
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = _tmp11_;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names_length1 = _tmp11__length1;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tag_names_size_ = tag_names_length1;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = hierarchical_tag_index_get_global_index ();
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = tag_names;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14__length1 = tag_names_length1;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = hierarchical_tag_index_get_paths_for_names_array (_tmp13_, _tmp14_, _tmp14__length1, &_tmp15_);
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = (_vala_array_free (tag_names, tag_names_length1, (GDestroyNotify) g_free), NULL);
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = _tmp16_;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names_length1 = _tmp15_;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tag_names_size_ = tag_names_length1;
-#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_hierarchical_tag_index_unref0 (_tmp13_);
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = tag_names;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17__length1 = tag_names_length1;
-#line 16671 "Dialogs.c"
+#line 16352 "Dialogs.c"
 	{
 		gchar** name_collection = NULL;
 		gint name_collection_length1 = 0;
 		gint _name_collection_size_ = 0;
 		gint name_it = 0;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		name_collection = _tmp17_;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		name_collection_length1 = _tmp17__length1;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (name_it = 0; name_it < _tmp17__length1; name_it = name_it + 1) {
-#line 16683 "Dialogs.c"
+#line 16364 "Dialogs.c"
 			gchar* _tmp18_ = NULL;
 			gchar* name = NULL;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = g_strdup (name_collection[name_it]);
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			name = _tmp18_;
-#line 16690 "Dialogs.c"
+#line 16371 "Dialogs.c"
 			{
 				GeeArrayList* _tmp19_ = NULL;
 				const gchar* _tmp20_ = NULL;
 				Tag* _tmp21_ = NULL;
 				Tag* _tmp22_ = NULL;
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp19_ = new_tags;
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp20_ = name;
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = tag_for_path (_tmp20_);
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp22_ = _tmp21_;
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp22_);
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (name);
-#line 16710 "Dialogs.c"
+#line 16391 "Dialogs.c"
 			}
 		}
 	}
-#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = new_tags;
-#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = (_vala_array_free (tag_names, tag_names_length1, (GDestroyNotify) g_free), NULL);
-#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16722 "Dialogs.c"
+#line 16403 "Dialogs.c"
 }
 
 
@@ -16744,28 +16425,28 @@ static gboolean modify_tags_dialog_real_on_modify_validate (TextEntryDialogMedia
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 2069 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_DIALOG, ModifyTagsDialog);
-#line 2069 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = text;
-#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = string_contains (_tmp0_, TAG_PATH_SEPARATOR_STRING);
-#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = !_tmp1_;
-#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16743 "Dialogs.c"
+#line 16424 "Dialogs.c"
 }
 
 
 static void modify_tags_dialog_class_init (ModifyTagsDialogClass * klass) {
-#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	modify_tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = modify_tags_dialog_real_on_modify_validate;
-#line 16752 "Dialogs.c"
+#line 16433 "Dialogs.c"
 }
 
 
@@ -16786,31 +16467,31 @@ GType modify_tags_dialog_get_type (void) {
 
 
 gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self) {
-#line 2076 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_WELCOME_SERVICE_ENTRY (self), NULL);
-#line 2076 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->get_service_name (self);
-#line 16777 "Dialogs.c"
+#line 16458 "Dialogs.c"
 }
 
 
 void welcome_service_entry_execute (WelcomeServiceEntry* self) {
-#line 2078 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (self));
-#line 2078 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->execute (self);
-#line 16786 "Dialogs.c"
+#line 16467 "Dialogs.c"
 }
 
 
 static void welcome_service_entry_base_init (WelcomeServiceEntryIface * iface) {
-#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	static gboolean initialized = FALSE;
-#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!initialized) {
-#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		initialized = TRUE;
-#line 16797 "Dialogs.c"
+#line 16478 "Dialogs.c"
 	}
 }
 
@@ -16922,255 +16603,255 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
 	GtkBox* _tmp90_ = NULL;
 	GtkWidget* _tmp91_ = NULL;
 	SpitDataImportsWelcomeImportMetaHost* _tmp92_ = NULL;
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), NULL);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (WelcomeDialog*) g_object_new (object_type, NULL);
-#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = spit_data_imports_welcome_import_meta_host_new (self);
-#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_meta_host);
-#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_meta_host = _tmp0_;
-#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = welcome_dialog_is_system_pictures_import_possible ();
-#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	show_system_pictures_import = _tmp1_;
-#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
-#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ok_button = _tmp3_;
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _ ("Welcome!");
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2101 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = owner;
-#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp5_);
-#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkLabel*) gtk_label_new ("");
-#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp6_);
-#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	primary_text = _tmp6_;
-#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = primary_text;
-#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _ ("Welcome to Shotwell!");
-#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = g_strdup_printf ("<span size=\"large\" weight=\"bold\">%s</span>", _tmp8_);
-#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (_tmp7_, _tmp10_);
-#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = primary_text;
-#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_xalign (_tmp11_, 0.0f);
-#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = primary_text;
-#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_yalign (_tmp12_, 0.5f);
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = (GtkLabel*) gtk_label_new ("");
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp13_);
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->secondary_text);
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->secondary_text = _tmp13_;
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = self->priv->secondary_text;
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = _ ("To get started, import photos in any of these ways:");
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = g_strdup_printf ("<span weight=\"normal\">%s</span>", _tmp15_);
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = _tmp16_;
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (_tmp14_, _tmp17_);
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp17_);
-#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->secondary_text;
-#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_xalign (_tmp18_, 0.0f);
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->secondary_text;
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_yalign (_tmp19_, 0.5f);
-#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = (GtkImage*) gtk_image_new_from_icon_name ("shotwell", GTK_ICON_SIZE_DIALOG);
-#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp20_);
-#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	image = _tmp20_;
-#line 2116 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 2116 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp21_);
-#line 2116 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	header_text = _tmp21_;
-#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = header_text;
-#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = primary_text;
-#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 5);
-#line 2118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = header_text;
-#line 2118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = self->priv->secondary_text;
-#line 2118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp26_);
-#line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	header_content = _tmp26_;
-#line 2121 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = header_content;
-#line 2121 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = image;
-#line 2121 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = header_content;
-#line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = header_text;
-#line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = (GtkLabel*) gtk_label_new ("");
-#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp31_);
-#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	instructions = _tmp31_;
-#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = g_strdup ("   ");
-#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	indent_prefix = _tmp32_;
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = gtk_widget_get_direction (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp34_ == GTK_TEXT_DIR_RTL) {
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = "◂";
-#line 17053 "Dialogs.c"
+#line 16734 "Dialogs.c"
 	} else {
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = "▸";
-#line 17057 "Dialogs.c"
+#line 16738 "Dialogs.c"
 	}
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = g_strdup (_tmp33_);
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	arrow_glyph = _tmp35_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = instructions;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = indent_prefix;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = g_strconcat (_tmp37_, "&#8226; %s\n", NULL);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = _tmp38_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = indent_prefix;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp41_ = g_strconcat (_tmp40_, "&#8226; %s\n", NULL);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = _tmp41_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = g_strconcat (_tmp39_, _tmp42_, NULL);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = _tmp43_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = indent_prefix;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = g_strconcat (_tmp45_, "&#8226; %s", NULL);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = _tmp46_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp48_ = g_strconcat (_tmp44_, _tmp47_, NULL);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = _tmp48_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp50_ = _ ("Choose <span weight=\"bold\">File %s Import From Folder</span>");
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp51_ = arrow_glyph;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = g_strdup_printf (_tmp50_, _tmp51_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp53_ = _tmp52_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = _ ("Drag and drop photos onto the Shotwell window");
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp55_ = _ ("Connect a camera to your computer and import");
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp56_ = g_strdup_printf (_tmp49_, _tmp53_, _tmp54_, _tmp55_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp57_ = _tmp56_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (_tmp36_, _tmp57_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp57_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp53_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp49_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp47_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp44_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp42_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp39_);
-#line 2134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp58_ = instructions;
-#line 2134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_xalign (_tmp58_, 0.0f);
-#line 2135 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp59_ = instructions;
-#line 2135 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_yalign (_tmp59_, 0.5f);
-#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp60_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp60_);
-#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_action_checkbox_packer);
-#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_action_checkbox_packer = _tmp60_;
-#line 2139 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp61_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#line 2139 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp61_);
-#line 2139 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
-#line 2139 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_action_checkbox_packer = _tmp61_;
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp62_ = self->priv->import_action_checkbox_packer;
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp63_ = self->priv->external_import_action_checkbox_packer;
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget));
-#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp64_ = show_system_pictures_import;
-#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp64_) {
-#line 17157 "Dialogs.c"
+#line 16838 "Dialogs.c"
 		const gchar* _tmp65_ = NULL;
 		GFile* _tmp66_ = NULL;
 		GFile* _tmp67_ = NULL;
@@ -17182,170 +16863,170 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
 		GtkBox* _tmp73_ = NULL;
 		GtkCheckButton* _tmp74_ = NULL;
 		GtkCheckButton* _tmp75_ = NULL;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp65_ = _ ("_Import photos from your %s folder");
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp66_ = app_dirs_get_import_dir ();
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp67_ = _tmp66_;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp68_ = get_display_pathname (_tmp67_);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp69_ = _tmp68_;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp70_ = g_strdup_printf (_tmp65_, _tmp69_);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = _tmp70_;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp72_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp71_);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp72_);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->system_pictures_import_check);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->system_pictures_import_check = _tmp72_;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp71_);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp69_);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp67_);
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp73_ = self->priv->import_action_checkbox_packer;
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp74_ = self->priv->system_pictures_import_check;
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
-#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp75_ = self->priv->system_pictures_import_check;
-#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 17207 "Dialogs.c"
+#line 16888 "Dialogs.c"
 	}
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp76_ = _ ("You can also import photos in any of these ways:");
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp77_ = (GtkLabel*) gtk_label_new (_tmp76_);
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp77_);
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->instruction_header);
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->instruction_header = _tmp77_;
-#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp78_ = self->priv->instruction_header;
-#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_xalign (_tmp78_, 0.0f);
-#line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp79_ = self->priv->instruction_header;
-#line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_yalign (_tmp79_, 0.5f);
-#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp80_ = self->priv->instruction_header;
-#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), 20);
-#line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp81_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 16);
-#line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp81_);
-#line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	content = _tmp81_;
-#line 2157 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp82_ = header_content;
-#line 2157 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp83_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp83_);
-#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_content);
-#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_content = _tmp83_;
-#line 2159 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp84_ = self->priv->import_content;
-#line 2159 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_widget_get_type (), GtkWidget));
-#line 2160 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp85_ = instructions;
-#line 2160 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp86_ = _ ("_Don’t show this message again");
-#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp87_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp86_);
-#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp87_);
-#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->hide_button);
-#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->hide_button = _tmp87_;
-#line 2163 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = self->priv->hide_button;
-#line 2163 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp89_ = self->priv->hide_button;
-#line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
-#line 2165 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
-#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
-#line 2167 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2168 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2169 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
-#line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 0);
-#line 2171 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
-#line 2172 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
-#line 2174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp90_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 2174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp91_ = ok_button;
-#line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_grab_focus (_tmp91_);
-#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_install_import_content (self);
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp92_ = self->priv->import_meta_host;
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spit_data_imports_welcome_import_meta_host_start (_tmp92_);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (content);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (arrow_glyph);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (indent_prefix);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (instructions);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (header_content);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (header_text);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (primary_text);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (ok_button);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 17325 "Dialogs.c"
+#line 17006 "Dialogs.c"
 }
 
 
 WelcomeDialog* welcome_dialog_new (GtkWindow* owner) {
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return welcome_dialog_construct (TYPE_WELCOME_DIALOG, owner);
-#line 17332 "Dialogs.c"
+#line 17013 "Dialogs.c"
 }
 
 
@@ -17354,101 +17035,101 @@ static void welcome_dialog_install_import_content (WelcomeDialog* self) {
 	gboolean _tmp1_ = FALSE;
 	GtkCheckButton** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->external_import_checks;
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2__length1 = self->priv->external_import_checks_length1;
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2__length1 > 0) {
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = TRUE;
-#line 17351 "Dialogs.c"
+#line 17032 "Dialogs.c"
 	} else {
 		GtkCheckButton* _tmp3_ = NULL;
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->system_pictures_import_check;
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 17358 "Dialogs.c"
+#line 17039 "Dialogs.c"
 	}
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 17362 "Dialogs.c"
+#line 17043 "Dialogs.c"
 		gboolean _tmp4_ = FALSE;
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->import_content_already_installed;
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_ == FALSE;
-#line 17368 "Dialogs.c"
+#line 17049 "Dialogs.c"
 	} else {
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 17372 "Dialogs.c"
+#line 17053 "Dialogs.c"
 	}
-#line 2184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 17376 "Dialogs.c"
+#line 17057 "Dialogs.c"
 		GtkLabel* _tmp5_ = NULL;
 		GtkBox* _tmp6_ = NULL;
 		GtkBox* _tmp7_ = NULL;
 		GtkBox* _tmp8_ = NULL;
 		GtkLabel* _tmp9_ = NULL;
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->secondary_text;
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_markup (_tmp5_, "");
-#line 2189 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->import_content;
-#line 2189 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->import_action_checkbox_packer;
-#line 2189 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->import_content;
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->instruction_header;
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2191 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->import_content_already_installed = TRUE;
-#line 17400 "Dialogs.c"
+#line 17081 "Dialogs.c"
 	}
 }
 
 
 static void _vala_array_add109 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value) {
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 17412 "Dialogs.c"
+#line 17093 "Dialogs.c"
 	}
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17418 "Dialogs.c"
+#line 17099 "Dialogs.c"
 }
 
 
 static void _vala_array_add110 (GtkCheckButton*** array, int* length, int* size, GtkCheckButton* value) {
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (GtkCheckButton*, *array, (*size) + 1);
-#line 17429 "Dialogs.c"
+#line 17110 "Dialogs.c"
 	}
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17435 "Dialogs.c"
+#line 17116 "Dialogs.c"
 }
 
 
@@ -17475,79 +17156,79 @@ void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEn
 	gint _tmp16__length1 = 0;
 	GtkCheckButton* _tmp17_ = NULL;
 	GtkBox* _tmp18_ = NULL;
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (entry));
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = entry;
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = welcome_service_entry_get_service_name (_tmp0_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup_printf ("WelcomeDialog: Installing service entry for %s", _tmp2_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2196: %s", _tmp4_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_debug ("Dialogs.vala:2186: %s", _tmp4_);
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp4_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp2_);
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->external_import_entries;
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5__length1 = self->priv->external_import_entries_length1;
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = entry;
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_array_add109 (&self->priv->external_import_entries, &self->priv->external_import_entries_length1, &self->priv->_external_import_entries_size_, _tmp7_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _ ("Import photos from your %s library");
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = entry;
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = welcome_service_entry_get_service_name (_tmp9_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = g_strdup_printf (_tmp8_, _tmp11_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp13_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp14_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = _tmp14_;
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp13_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp11_);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	entry_check = _tmp15_;
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->external_import_checks;
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16__length1 = self->priv->external_import_checks_length1;
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = _g_object_ref0 (entry_check);
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_array_add110 (&self->priv->external_import_checks, &self->priv->external_import_checks_length1, &self->priv->_external_import_checks_size_, _tmp17_);
-#line 2201 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 2202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->external_import_action_checkbox_packer;
-#line 2202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_widget_get_type (), GtkWidget));
-#line 2203 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_install_import_content (self);
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (entry_check);
-#line 17534 "Dialogs.c"
+#line 17215 "Dialogs.c"
 }
 
 
@@ -17558,66 +17239,66 @@ void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEn
      */
 static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp) {
 	gint _tmp0_ = 0;
-#line 2211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = resp;
-#line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 2213 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2203 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->ok_clicked = TRUE;
-#line 17553 "Dialogs.c"
+#line 17234 "Dialogs.c"
 	}
-#line 2215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2216 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_main_quit ();
-#line 17559 "Dialogs.c"
+#line 17240 "Dialogs.c"
 }
 
 
 static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 2222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_on_dismiss ((WelcomeDialog*) self, response_id);
-#line 17566 "Dialogs.c"
+#line 17247 "Dialogs.c"
 }
 
 
 static void _vala_array_add111 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value) {
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 17577 "Dialogs.c"
+#line 17258 "Dialogs.c"
 	}
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17583 "Dialogs.c"
+#line 17264 "Dialogs.c"
 }
 
 
 static WelcomeServiceEntry** _vala_array_dup29 (WelcomeServiceEntry** self, int length) {
 	WelcomeServiceEntry** result;
 	int i;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = g_new0 (WelcomeServiceEntry*, length + 1);
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	for (i = 0; i < length; i++) {
-#line 17594 "Dialogs.c"
+#line 17275 "Dialogs.c"
 		WelcomeServiceEntry* _tmp0_ = NULL;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result[i] = _tmp0_;
-#line 17600 "Dialogs.c"
+#line 17281 "Dialogs.c"
 	}
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17604 "Dialogs.c"
+#line 17285 "Dialogs.c"
 }
 
 
@@ -17641,62 +17322,62 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 	gint _tmp20__length1 = 0;
 	gboolean _tmp21_ = FALSE;
 	GtkCheckButton* _tmp22_ = NULL;
-#line 2219 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_WELCOME_DIALOG (self), FALSE);
-#line 2222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), "response", (GCallback) _welcome_dialog_on_dismiss_gtk_dialog_response, self, 0);
-#line 2223 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2224 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_main ();
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_parse_name ("response", gtk_dialog_get_type (), &_tmp0_, NULL, FALSE);
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _welcome_dialog_on_dismiss_gtk_dialog_response, self);
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->ok_clicked;
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ok = _tmp1_;
-#line 2236 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	show_dialog = TRUE;
-#line 2238 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = ok;
-#line 2238 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 17652 "Dialogs.c"
+#line 17333 "Dialogs.c"
 		GtkCheckButton* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->hide_button;
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		show_dialog = !_tmp4_;
-#line 17661 "Dialogs.c"
+#line 17342 "Dialogs.c"
 	}
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = _tmp5_;
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result__length1 = 0;
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	__result__size_ = _result__length1;
-#line 17671 "Dialogs.c"
+#line 17352 "Dialogs.c"
 	{
 		gint i = 0;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 17676 "Dialogs.c"
+#line 17357 "Dialogs.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = TRUE;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 17683 "Dialogs.c"
+#line 17364 "Dialogs.c"
 				gint _tmp8_ = 0;
 				WelcomeServiceEntry** _tmp9_ = NULL;
 				gint _tmp9__length1 = 0;
@@ -17705,43 +17386,43 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 				gint _tmp11_ = 0;
 				GtkCheckButton* _tmp12_ = NULL;
 				gboolean _tmp13_ = FALSE;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
-#line 17694 "Dialogs.c"
+#line 17375 "Dialogs.c"
 					gint _tmp7_ = 0;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = i;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					i = _tmp7_ + 1;
-#line 17700 "Dialogs.c"
+#line 17381 "Dialogs.c"
 				}
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp8_ = i;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9_ = self->priv->external_import_entries;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9__length1 = self->priv->external_import_entries_length1;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp8_ < _tmp9__length1)) {
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 17714 "Dialogs.c"
+#line 17395 "Dialogs.c"
 				}
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = self->priv->external_import_checks;
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10__length1 = self->priv->external_import_checks_length1;
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = i;
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = _tmp10_[_tmp11_];
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_ == TRUE) {
-#line 17728 "Dialogs.c"
+#line 17409 "Dialogs.c"
 					WelcomeServiceEntry** _tmp14_ = NULL;
 					gint _tmp14__length1 = 0;
 					WelcomeServiceEntry** _tmp15_ = NULL;
@@ -17749,93 +17430,93 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 					gint _tmp16_ = 0;
 					WelcomeServiceEntry* _tmp17_ = NULL;
 					WelcomeServiceEntry* _tmp18_ = NULL;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14_ = _result_;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14__length1 = _result__length1;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp15_ = self->priv->external_import_entries;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp15__length1 = self->priv->external_import_entries_length1;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp16_ = i;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp17_ = _tmp15_[_tmp16_];
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp18_ = _g_object_ref0 (_tmp17_);
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_vala_array_add111 (&_result_, &_result__length1, &__result__size_, _tmp18_);
-#line 17752 "Dialogs.c"
+#line 17433 "Dialogs.c"
 				}
 			}
 		}
 	}
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = _result_;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19__length1 = _result__length1;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup29 (_tmp19_, _tmp19__length1) : ((gpointer) _tmp19_);
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20__length1 = _tmp19__length1;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_selected_import_entries = _tmp20_;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_selected_import_entries_length1 = _tmp20__length1;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->system_pictures_import_check;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp22_ != NULL) {
-#line 17775 "Dialogs.c"
+#line 17456 "Dialogs.c"
 		GtkCheckButton* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = self->priv->system_pictures_import_check;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _tmp24_;
-#line 17784 "Dialogs.c"
+#line 17465 "Dialogs.c"
 	} else {
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = FALSE;
-#line 17788 "Dialogs.c"
+#line 17469 "Dialogs.c"
 	}
-#line 2248 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2238 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_do_system_pictures_import = _tmp21_;
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = show_dialog;
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (selected_import_entries) {
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*selected_import_entries = _vala_selected_import_entries;
-#line 17802 "Dialogs.c"
+#line 17483 "Dialogs.c"
 	} else {
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 17806 "Dialogs.c"
+#line 17487 "Dialogs.c"
 	}
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (selected_import_entries_length1) {
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*selected_import_entries_length1 = _vala_selected_import_entries_length1;
-#line 17812 "Dialogs.c"
+#line 17493 "Dialogs.c"
 	}
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (do_system_pictures_import) {
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*do_system_pictures_import = _vala_do_system_pictures_import;
-#line 17818 "Dialogs.c"
+#line 17499 "Dialogs.c"
 	}
-#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17822 "Dialogs.c"
+#line 17503 "Dialogs.c"
 }
 
 
@@ -17848,37 +17529,37 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 	GFile* _tmp3_ = NULL;
 	GFileType _tmp4_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_dirs_get_import_dir ();
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	system_pictures = _tmp0_;
-#line 2258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = system_pictures;
-#line 2258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = g_file_query_exists (_tmp1_, NULL);
-#line 2258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp2_) {
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17851 "Dialogs.c"
+#line 17532 "Dialogs.c"
 	}
-#line 2261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = system_pictures;
-#line 2261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_file_query_file_type (_tmp3_, G_FILE_QUERY_INFO_NONE, NULL);
-#line 2261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!(_tmp4_ == G_FILE_TYPE_DIRECTORY)) {
-#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17865 "Dialogs.c"
+#line 17546 "Dialogs.c"
 	}
 	{
 		GFileEnumerator* syspics_child_enum = NULL;
@@ -17890,152 +17571,152 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		GFileInfo* _tmp10_ = NULL;
 		GFileInfo* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = system_pictures;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = g_file_enumerate_children (_tmp5_, "standard::*", G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		syspics_child_enum = _tmp6_;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17885 "Dialogs.c"
+#line 17566 "Dialogs.c"
 			goto __catch423_g_error;
 		}
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = syspics_child_enum;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = g_file_enumerator_next_file (_tmp8_, NULL, &_inner_error_);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp9_;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (syspics_child_enum);
-#line 17898 "Dialogs.c"
+#line 17579 "Dialogs.c"
 			goto __catch423_g_error;
 		}
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp7_;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = NULL;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = _tmp10_;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp11_ != NULL;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp11_);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp12_;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (syspics_child_enum);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17921 "Dialogs.c"
+#line 17602 "Dialogs.c"
 	}
 	goto __finally423;
 	__catch423_g_error:
 	{
 		GError* e = NULL;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		e = _inner_error_;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_inner_error_ = NULL;
-#line 2269 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2269 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_error_free0 (e);
-#line 2269 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2269 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17939 "Dialogs.c"
+#line 17620 "Dialogs.c"
 	}
 	__finally423:
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (system_pictures);
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2254 "/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 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_clear_error (&_inner_error_);
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return FALSE;
-#line 17950 "Dialogs.c"
+#line 17631 "Dialogs.c"
 }
 
 
 static void welcome_dialog_class_init (WelcomeDialogClass * klass) {
-#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (WelcomeDialogPrivate));
-#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = welcome_dialog_finalize;
-#line 17961 "Dialogs.c"
+#line 17642 "Dialogs.c"
 }
 
 
 static void welcome_dialog_instance_init (WelcomeDialog * self) {
 	GtkCheckButton** _tmp0_ = NULL;
 	WelcomeServiceEntry** _tmp1_ = NULL;
-#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = WELCOME_DIALOG_GET_PRIVATE (self);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->system_pictures_import_check = NULL;
-#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_new0 (GtkCheckButton*, 0 + 1);
-#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_checks = _tmp0_;
-#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_checks_length1 = 0;
-#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->_external_import_checks_size_ = self->priv->external_import_checks_length1;
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_entries = _tmp1_;
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_entries_length1 = 0;
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->_external_import_entries_size_ = self->priv->external_import_entries_length1;
-#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_content_already_installed = FALSE;
-#line 2093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->ok_clicked = FALSE;
-#line 17992 "Dialogs.c"
+#line 17673 "Dialogs.c"
 }
 
 
 static void welcome_dialog_finalize (GObject* obj) {
 	WelcomeDialog * self;
-#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WELCOME_DIALOG, WelcomeDialog);
-#line 2082 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->hide_button);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->system_pictures_import_check);
-#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_checks = (_vala_array_free (self->priv->external_import_checks, self->priv->external_import_checks_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_entries = (_vala_array_free (self->priv->external_import_entries, self->priv->external_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->secondary_text);
-#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2077 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->instruction_header);
-#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2078 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_content);
-#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_action_checkbox_packer);
-#line 2090 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
-#line 2091 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->import_meta_host);
 #line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_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 18022 "Dialogs.c"
+#line 17703 "Dialogs.c"
 }
 
 
@@ -18054,92 +17735,92 @@ GType welcome_dialog_get_type (void) {
 static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_on_delete ((PreferencesDialog*) self);
-#line 2318 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18043 "Dialogs.c"
+#line 17724 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_close ((PreferencesDialog*) self);
-#line 18050 "Dialogs.c"
+#line 17731 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_value_changed ((PreferencesDialog*) self);
-#line 18057 "Dialogs.c"
+#line 17738 "Dialogs.c"
 }
 
 
 static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_on_bg_color_reset ((PreferencesDialog*) self, event);
-#line 2327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18066 "Dialogs.c"
+#line 17747 "Dialogs.c"
 }
 
 
 static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_on_local_pattern_help ((PreferencesDialog*) self, uri);
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18075 "Dialogs.c"
+#line 17756 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_combo_changed ((PreferencesDialog*) self);
-#line 18082 "Dialogs.c"
+#line 17763 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_entry_changed ((PreferencesDialog*) self);
-#line 18089 "Dialogs.c"
+#line 17770 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_lowercase_toggled ((PreferencesDialog*) self);
-#line 18096 "Dialogs.c"
+#line 17777 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_photo_editor_changed ((PreferencesDialog*) self);
-#line 18103 "Dialogs.c"
+#line 17784 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_raw_editor_changed ((PreferencesDialog*) self);
-#line 18110 "Dialogs.c"
+#line 17791 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_default_raw_developer_changed ((PreferencesDialog*) self);
-#line 18117 "Dialogs.c"
+#line 17798 "Dialogs.c"
 }
 
 
 static gboolean _preferences_dialog_map_event_gtk_widget_map_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_map_event ((PreferencesDialog*) self);
-#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18126 "Dialogs.c"
+#line 17807 "Dialogs.c"
 }
 
 
@@ -18259,196 +17940,196 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 	RawDeveloper _tmp120_ = 0;
 	GtkComboBoxText* _tmp121_ = NULL;
 	GtkDialog* _tmp122_ = NULL;
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (PreferencesDialog*) g_type_create_instance (object_type);
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->builder = _tmp0_;
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->builder;
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_builder_get_object (_tmp1_, "preferences_dialog");
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_dialog_get_type ()) ? ((GtkDialog*) _tmp2_) : NULL);
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dialog = _tmp3_;
-#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gtk_settings_get_default ();
-#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = use_header;
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp5_) {
-#line 18272 "Dialogs.c"
+#line 17953 "Dialogs.c"
 		GtkWidget* null_titlebar = NULL;
 		GtkDialog* _tmp6_ = NULL;
 		GtkWidget* _tmp7_ = NULL;
-#line 2313 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		null_titlebar = NULL;
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->dialog;
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = null_titlebar;
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_titlebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp7_);
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (null_titlebar);
-#line 18286 "Dialogs.c"
+#line 17967 "Dialogs.c"
 	}
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->dialog;
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = app_window_get_instance ();
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp10_);
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = self->priv->dialog;
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = app_window_get_instance ();
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2318 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = self->priv->dialog;
-#line 2318 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _preferences_dialog_on_delete_gtk_widget_delete_event, self);
-#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->dialog;
-#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (_tmp16_, "response", (GCallback) _preferences_dialog_on_close_gtk_dialog_response, self);
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->builder;
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = gtk_builder_get_object (_tmp17_, "bg_color_adjustment");
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_adjustment_get_type ()) ? ((GtkAdjustment*) _tmp18_) : NULL);
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_adjustment);
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->bg_color_adjustment = _tmp19_;
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->bg_color_adjustment;
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = self->priv->bg_color_adjustment;
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = gtk_adjustment_get_upper (_tmp21_);
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = config_facade_get_instance ();
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = _tmp23_;
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	config_facade_get_bg_color (_tmp24_, &_tmp25_);
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = _tmp25_.red;
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_adjustment_set_value (_tmp20_, _tmp22_ - (_tmp26_ * 65535.0));
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp24_);
-#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = self->priv->bg_color_adjustment;
-#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (_tmp27_, "value-changed", (GCallback) _preferences_dialog_on_value_changed_gtk_adjustment_value_changed, self);
-#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = self->priv->builder;
-#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = gtk_builder_get_object (_tmp28_, "bg_color_slider");
-#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp29_) : NULL);
-#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_slider);
-#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->bg_color_slider = _tmp30_;
-#line 2327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = self->priv->bg_color_slider;
-#line 2327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event, self);
-#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = self->priv->builder;
-#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = gtk_builder_get_object (_tmp32_, "library_dir_button");
-#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp33_, gtk_file_chooser_button_get_type ()) ? ((GtkFileChooserButton*) _tmp33_) : NULL);
-#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->library_dir_button);
-#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->library_dir_button = _tmp34_;
-#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = self->priv->builder;
-#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = gtk_builder_get_object (_tmp35_, "external_photo_editor_combo");
-#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp36_) : NULL);
-#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->photo_editor_combo);
-#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->photo_editor_combo = _tmp37_;
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = self->priv->builder;
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = gtk_builder_get_object (_tmp38_, "external_raw_editor_combo");
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp39_) : NULL);
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->raw_editor_combo);
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->raw_editor_combo = _tmp40_;
-#line 2334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp41_ = self->priv->builder;
-#line 2334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = gtk_builder_get_object (_tmp41_, "pattern_help");
-#line 2334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp42_) : NULL);
-#line 2334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pattern_help = _tmp43_;
-#line 2341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = resources_get_help_path ();
-#line 2341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	help_path = _tmp44_;
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = help_path;
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp45_ == NULL) {
-#line 18410 "Dialogs.c"
+#line 18091 "Dialogs.c"
 		GtkLabel* _tmp46_ = NULL;
 		const gchar* _tmp47_ = NULL;
 		gchar* _tmp48_ = NULL;
 		gchar* _tmp49_ = NULL;
 		gchar* _tmp50_ = NULL;
 		gchar* _tmp51_ = NULL;
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp46_ = pattern_help;
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp47_ = _ ("(Help)");
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp48_ = g_strconcat ("<a href=\"" RESOURCES_DIR_PATTERN_URI_SYSWIDE "\">", _tmp47_, NULL);
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp49_ = _tmp48_;
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp50_ = g_strconcat (_tmp49_, "</a>", NULL);
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = _tmp50_;
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_markup (_tmp46_, _tmp51_);
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp51_);
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp49_);
-#line 18435 "Dialogs.c"
+#line 18116 "Dialogs.c"
 	} else {
 		GtkLabel* _tmp52_ = NULL;
 		const gchar* _tmp53_ = NULL;
@@ -18457,260 +18138,260 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 		gchar* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
 		GtkLabel* _tmp58_ = NULL;
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp52_ = pattern_help;
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp53_ = _ ("(Help)");
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp54_ = g_strconcat ("<a href=\"dummy:\">", _tmp53_, NULL);
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp55_ = _tmp54_;
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp56_ = g_strconcat (_tmp55_, "</a>", NULL);
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp57_ = _tmp56_;
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_markup (_tmp52_, _tmp57_);
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp57_);
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp55_);
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp58_ = pattern_help;
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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 18466 "Dialogs.c"
+#line 18147 "Dialogs.c"
 	}
-#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp59_ = self->priv->builder;
-#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp60_ = gtk_builder_get_object (_tmp59_, "dir choser");
-#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp61_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp60_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp60_) : NULL);
-#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_combo);
-#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dir_pattern_combo = _tmp61_;
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp62_ = self->priv->builder;
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp63_ = gtk_builder_get_object (_tmp62_, "dir_pattern_entry");
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp64_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp63_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp63_) : NULL);
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_entry);
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dir_pattern_entry = _tmp64_;
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp65_ = self->priv->builder;
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp66_ = gtk_builder_get_object (_tmp65_, "dynamic example");
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp66_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp66_) : NULL);
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_example);
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dir_pattern_example = _tmp67_;
-#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = _ ("Year%sMonth%sDay");
-#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp69_ = g_strdup_printf (_tmp68_, G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S);
-#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70_ = _tmp69_;
-#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp70_, "%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
-#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp70_);
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp71_ = _ ("Year%sMonth");
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp72_ = g_strdup_printf (_tmp71_, G_DIR_SEPARATOR_S);
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = _tmp72_;
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp73_, "%Y" G_DIR_SEPARATOR_S "%m");
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp73_);
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp74_ = _ ("Year%sMonth-Day");
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75_ = g_strdup_printf (_tmp74_, G_DIR_SEPARATOR_S);
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp76_ = _tmp75_;
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp76_, "%Y" G_DIR_SEPARATOR_S "%m-%d");
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp76_);
-#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp77_ = _ ("Year-Month-Day");
-#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp77_, "%Y-%m-%d");
-#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp78_ = _ ("Custom");
-#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp78_, NULL);
-#line 2364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp79_ = self->priv->dir_pattern_combo;
-#line 2364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed, self);
-#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp80_ = self->priv->dir_pattern_entry;
-#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed, self);
-#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp81_ = self->priv->builder;
-#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp82_ = gtk_builder_get_object (_tmp81_, "dir_structure_label");
-#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp83_ = self->priv->dir_pattern_combo;
-#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_mnemonic_widget (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp82_) : NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_widget_get_type (), GtkWidget));
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp84_ = self->priv->builder;
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp85_ = gtk_builder_get_object (_tmp84_, "lowercase");
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp86_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp85_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp85_) : NULL);
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->lowercase);
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->lowercase = _tmp86_;
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp87_ = self->priv->lowercase;
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled, self);
-#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = self->priv->builder;
-#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp89_ = gtk_builder_get_object (_tmp88_, "preferences-notebook");
-#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp90_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp89_, gtk_notebook_get_type ()) ? ((GtkNotebook*) _tmp89_) : NULL);
-#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	notebook = _tmp90_;
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp91_ = gtk_notebook_get_nth_page (notebook, 2);
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp92_ = self->priv->plugins_mediator;
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp93_ = plugins_manifest_widget_mediator_get_widget (_tmp92_);
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp94_ = _tmp93_;
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_TYPE (_tmp91_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp91_) : NULL, _tmp94_);
-#line 2375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_preference_options (self);
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp95_ = self->priv->photo_editor_combo;
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (_tmp95_, "changed", (GCallback) _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed, self);
-#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp96_ = self->priv->raw_editor_combo;
-#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (_tmp96_, "changed", (GCallback) _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed, self);
-#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp97_ = self->priv->builder;
-#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp98_ = gtk_builder_get_object (_tmp97_, "autoimport");
-#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp99_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp98_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp98_) : NULL);
-#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	auto_import_button = _tmp99_;
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp100_ = config_facade_get_instance ();
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp101_ = _tmp100_;
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp102_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (auto_import_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp102_);
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp101_);
-#line 2383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp103_ = self->priv->builder;
-#line 2383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp104_ = gtk_builder_get_object (_tmp103_, "write_metadata");
-#line 2383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp105_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp104_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp104_) : NULL);
-#line 2383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	commit_metadata_button = _tmp105_;
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp106_ = config_facade_get_instance ();
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp107_ = _tmp106_;
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp108_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (commit_metadata_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp108_);
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp107_);
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp109_ = self->priv->builder;
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp110_ = gtk_builder_get_object (_tmp109_, "default_raw_developer");
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp111_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp110_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp110_) : NULL);
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->default_raw_developer_combo);
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->default_raw_developer_combo = _tmp111_;
-#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp112_ = self->priv->default_raw_developer_combo;
-#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp113_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA);
-#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp114_ = _tmp113_;
-#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp112_, _tmp114_);
-#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp114_);
-#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp115_ = self->priv->default_raw_developer_combo;
-#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp116_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL);
-#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp117_ = _tmp116_;
-#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp115_, _tmp117_);
-#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp117_);
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp118_ = config_facade_get_instance ();
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp119_ = _tmp118_;
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp120_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_set_raw_developer_combo (self, _tmp120_);
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp119_);
-#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp121_ = self->priv->default_raw_developer_combo;
-#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed, self);
-#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp122_ = self->priv->dialog;
-#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp122_, gtk_widget_get_type (), GtkWidget), "map-event", (GCallback) _preferences_dialog_map_event_gtk_widget_map_event, self);
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (commit_metadata_button);
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (auto_import_button);
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (notebook);
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (help_path);
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (pattern_help);
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 18690 "Dialogs.c"
+#line 18371 "Dialogs.c"
 }
 
 
 static PreferencesDialog* preferences_dialog_new (void) {
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return preferences_dialog_construct (TYPE_PREFERENCES_DIALOG);
-#line 18697 "Dialogs.c"
+#line 18378 "Dialogs.c"
 }
 
 
@@ -18741,111 +18422,111 @@ void preferences_dialog_populate_preference_options (PreferencesDialog* self) {
 	ConfigFacade* _tmp21_ = NULL;
 	ConfigFacade* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
-#line 2395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->photo_editor_combo;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = photo_file_format_get_editable_mime_types (&_tmp1_);
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3__length1 = _tmp1_;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_app_combo_box (self, _tmp0_, _tmp3_, _tmp1_, _tmp7_, &_tmp8_);
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_photo_apps);
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_photo_apps = _tmp8_;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp7_);
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) g_free), NULL);
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->raw_editor_combo;
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = photo_file_format_get_mime_types (PHOTO_FILE_FORMAT_RAW, &_tmp10_);
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_;
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12__length1 = _tmp10_;
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = config_facade_get_instance ();
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = _tmp15_;
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_app_combo_box (self, _tmp9_, _tmp12_, _tmp10_, _tmp16_, &_tmp17_);
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_raw_apps);
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_raw_apps = _tmp17_;
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp16_);
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_free), NULL);
-#line 2402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->dir_pattern_combo;
-#line 2402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->dir_pattern_entry;
-#line 2402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_setup_dir_pattern (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), _tmp19_);
-#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->lowercase;
-#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = config_facade_get_instance ();
-#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
-#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp23_);
-#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp22_);
-#line 18804 "Dialogs.c"
+#line 18485 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self, const gchar* ignore) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2409 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2409 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (ignore != NULL, FALSE);
-#line 18815 "Dialogs.c"
+#line 18496 "Dialogs.c"
 	{
 		AppWindow* _tmp0_ = NULL;
 		AppWindow* _tmp1_ = NULL;
 		GdkScreen* _tmp2_ = NULL;
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = app_window_get_instance ();
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp0_;
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		resources_launch_help (_tmp2_, "other-files.page", &_inner_error_);
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp1_);
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18832 "Dialogs.c"
+#line 18513 "Dialogs.c"
 			goto __catch424_g_error;
 		}
 	}
@@ -18855,36 +18536,36 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		e = _inner_error_;
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_inner_error_ = NULL;
-#line 2413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = e;
-#line 2413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp3_->message;
-#line 2413 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_message ("Dialogs.vala:2413: Unable to launch help: %s", _tmp4_);
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		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 18854 "Dialogs.c"
+#line 18535 "Dialogs.c"
 	}
 	__finally424:
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_clear_error (&_inner_error_);
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return FALSE;
-#line 18865 "Dialogs.c"
+#line 18546 "Dialogs.c"
 	}
-#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18871 "Dialogs.c"
+#line 18552 "Dialogs.c"
 }
 
 
@@ -18919,110 +18600,110 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 	GtkListStore* _tmp68_ = NULL;
 	gint _tmp69_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (current_app_executable != NULL);
-#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = mime_types;
-#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0__length1 = mime_types_length1;
-#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0__length1 != 0, "mime_types.length != 0");
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = mime_types;
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1__length1 = mime_types_length1;
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = desktop_integration_get_apps_for_mime_types (_tmp1_, _tmp1__length1);
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_vala_external_apps);
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_external_apps = _tmp2_;
-#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _vala_external_apps;
-#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ == 0) {
-#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (external_apps) {
-#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			*external_apps = _vala_external_apps;
-#line 18940 "Dialogs.c"
+#line 18621 "Dialogs.c"
 		} else {
-#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_vala_external_apps);
-#line 18944 "Dialogs.c"
+#line 18625 "Dialogs.c"
 		}
-#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 18948 "Dialogs.c"
+#line 18629 "Dialogs.c"
 	}
-#line 2428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
-#line 2428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp6_);
-#line 2428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pixbuf_renderer = _tmp6_;
-#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp7_);
-#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_renderer = _tmp7_;
-#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = combo_box;
-#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout));
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = combo_box;
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = pixbuf_renderer;
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = combo_box;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = text_renderer;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = combo_box;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = pixbuf_renderer;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
-#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = combo_box;
-#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = text_renderer;
-#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp17_ = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING, -1);
+#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	combo_store = _tmp17_;
-#line 2440 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	current_app = -1;
-#line 18996 "Dialogs.c"
+#line 18677 "Dialogs.c"
 	{
 		GeeIterator* _app_it = NULL;
 		SortedList* _tmp18_ = NULL;
 		GeeIterator* _tmp19_ = NULL;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = _vala_external_apps;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_app_it = _tmp19_;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 19009 "Dialogs.c"
+#line 18690 "Dialogs.c"
 			GeeIterator* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			GAppInfo* app = NULL;
@@ -19042,44 +18723,44 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 			GAppInfo* _tmp61_ = NULL;
 			const gchar* _tmp62_ = NULL;
 			const gchar* _tmp63_ = NULL;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = _app_it;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp21_) {
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 19037 "Dialogs.c"
+#line 18718 "Dialogs.c"
 			}
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = _app_it;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = gee_iterator_get (_tmp22_);
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			app = (GAppInfo*) _tmp23_;
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = combo_store;
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_list_store_append (_tmp24_, &_tmp25_);
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			iter = _tmp25_;
-#line 2445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = app;
-#line 2445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = g_app_info_get_icon (_tmp26_);
-#line 2445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 2445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			app_icon = _tmp28_;
-#line 19059 "Dialogs.c"
+#line 18740 "Dialogs.c"
 			{
 				GIcon* _tmp29_ = NULL;
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp29_ = app_icon;
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, g_file_icon_get_type ())) {
-#line 19066 "Dialogs.c"
+#line 18747 "Dialogs.c"
 					GdkPixbuf* _tmp30_ = NULL;
 					GIcon* _tmp31_ = NULL;
 					GFile* _tmp32_ = NULL;
@@ -19091,51 +18772,51 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 					GtkTreeIter _tmp38_ = {0};
 					GdkPixbuf* _tmp39_ = NULL;
 					GValue _tmp40_ = {0};
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp31_ = app_icon;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp32_ = g_file_icon_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_file_icon_get_type (), GFileIcon));
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp33_ = g_file_get_path (_tmp32_);
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp34_ = _tmp33_;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp35_ = gdk_pixbuf_new_from_file (_tmp34_, &_inner_error_);
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp36_ = _tmp35_;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_free0 (_tmp34_);
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp30_ = _tmp36_;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19096 "Dialogs.c"
+#line 18777 "Dialogs.c"
 						goto __catch425_g_error;
 					}
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp37_ = combo_store;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp38_ = iter;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp39_ = scale_pixbuf (_tmp30_, RESOURCES_DEFAULT_ICON_SCALE, GDK_INTERP_BILINEAR, FALSE);
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					g_value_init (&_tmp40_, gdk_pixbuf_get_type ());
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
+					g_value_init (&_tmp40_, GDK_TYPE_PIXBUF);
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					g_value_take_object (&_tmp40_, _tmp39_);
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_list_store_set_value (_tmp37_, &_tmp38_, 0, &_tmp40_);
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					G_IS_VALUE (&_tmp40_) ? (g_value_unset (&_tmp40_), NULL) : NULL;
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_object_unref0 (_tmp30_);
-#line 19115 "Dialogs.c"
+#line 18796 "Dialogs.c"
 				} else {
 					GIcon* _tmp41_ = NULL;
-#line 2451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp41_ = app_icon;
-#line 2451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, g_themed_icon_get_type ())) {
-#line 19122 "Dialogs.c"
+#line 18803 "Dialogs.c"
 						GdkPixbuf* icon_pixbuf = NULL;
 						GtkIconTheme* _tmp42_ = NULL;
 						GIcon* _tmp43_ = NULL;
@@ -19147,40 +18828,40 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 						GtkTreeIter _tmp49_ = {0};
 						GdkPixbuf* _tmp50_ = NULL;
 						GValue _tmp51_ = {0};
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp42_ = gtk_icon_theme_get_default ();
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp43_ = app_icon;
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp45_ = _tmp44_ = g_themed_icon_get_names (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, g_themed_icon_get_type (), GThemedIcon));
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp46_ = _tmp45_[0];
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp47_ = gtk_icon_theme_load_icon (_tmp42_, _tmp46_, RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE, &_inner_error_);
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						icon_pixbuf = _tmp47_;
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19148 "Dialogs.c"
+#line 18829 "Dialogs.c"
 							goto __catch425_g_error;
 						}
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp48_ = combo_store;
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp49_ = iter;
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp50_ = icon_pixbuf;
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						g_value_init (&_tmp51_, gdk_pixbuf_get_type ());
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+						g_value_init (&_tmp51_, GDK_TYPE_PIXBUF);
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						g_value_set_object (&_tmp51_, _tmp50_);
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						gtk_list_store_set_value (_tmp48_, &_tmp49_, 0, &_tmp51_);
-#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL;
-#line 2451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_g_object_unref0 (icon_pixbuf);
-#line 19167 "Dialogs.c"
+#line 18848 "Dialogs.c"
 					}
 				}
 			}
@@ -19192,133 +18873,133 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 				const gchar* _tmp53_ = NULL;
 				gchar* _tmp54_ = NULL;
 				gchar* _tmp55_ = NULL;
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_error_ = _inner_error_;
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_inner_error_ = NULL;
-#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp52_ = _error_;
-#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp53_ = _tmp52_->message;
-#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp54_ = g_strconcat ("Error loading icon pixbuf: ", _tmp53_, NULL);
-#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp55_ = _tmp54_;
-#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_warning ("Dialogs.vala:2459: %s", _tmp55_);
-#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				g_warning ("Dialogs.vala:2449: %s", _tmp55_);
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp55_);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_error_free0 (_error_);
-#line 19197 "Dialogs.c"
+#line 18878 "Dialogs.c"
 			}
 			__finally425:
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (app_icon);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (app);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_app_it);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (combo_store);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (text_renderer);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (pixbuf_renderer);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/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 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_clear_error (&_inner_error_);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return;
-#line 19220 "Dialogs.c"
+#line 18901 "Dialogs.c"
 			}
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp56_ = combo_store;
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp57_ = iter;
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp58_ = app;
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp59_ = g_app_info_get_name (_tmp58_);
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_value_init (&_tmp60_, G_TYPE_STRING);
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_value_set_string (&_tmp60_, _tmp59_);
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_list_store_set_value (_tmp56_, &_tmp57_, 1, &_tmp60_);
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			G_IS_VALUE (&_tmp60_) ? (g_value_unset (&_tmp60_), NULL) : NULL;
-#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp61_ = app;
-#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp62_ = g_app_info_get_commandline (_tmp61_);
-#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp63_ = current_app_executable;
-#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (g_strcmp0 (_tmp62_, _tmp63_) == 0) {
-#line 19246 "Dialogs.c"
+#line 18927 "Dialogs.c"
 				SortedList* _tmp64_ = NULL;
 				GAppInfo* _tmp65_ = NULL;
 				gint _tmp66_ = 0;
-#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp64_ = _vala_external_apps;
-#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp65_ = app;
-#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp66_ = sorted_list_index_of (_tmp64_, _tmp65_);
-#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_app = _tmp66_;
-#line 19258 "Dialogs.c"
+#line 18939 "Dialogs.c"
 			}
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (app_icon);
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (app);
-#line 19264 "Dialogs.c"
+#line 18945 "Dialogs.c"
 		}
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_app_it);
-#line 19268 "Dialogs.c"
+#line 18949 "Dialogs.c"
 	}
-#line 2470 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = combo_box;
-#line 2470 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = combo_store;
-#line 2470 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_set_model (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp69_ = current_app;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp69_ != -1) {
-#line 19280 "Dialogs.c"
+#line 18961 "Dialogs.c"
 		GtkComboBox* _tmp70_ = NULL;
 		gint _tmp71_ = 0;
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp70_ = combo_box;
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = current_app;
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (_tmp70_, _tmp71_);
-#line 19289 "Dialogs.c"
+#line 18970 "Dialogs.c"
 	}
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (combo_store);
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (text_renderer);
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (pixbuf_renderer);
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (external_apps) {
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*external_apps = _vala_external_apps;
-#line 19301 "Dialogs.c"
+#line 18982 "Dialogs.c"
 	} else {
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_vala_external_apps);
-#line 19305 "Dialogs.c"
+#line 18986 "Dialogs.c"
 	}
 }
 
@@ -19332,35 +19013,35 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 	gboolean found = FALSE;
 	const gchar* _tmp4_ = NULL;
 	gboolean _tmp32_ = FALSE;
-#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_ENTRY (entry));
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = configuration_facade_get_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pattern = _tmp3_;
-#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	found = FALSE;
-#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = pattern;
-#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL != _tmp4_) {
-#line 19343 "Dialogs.c"
+#line 19024 "Dialogs.c"
 		gint i = 0;
-#line 2481 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 19347 "Dialogs.c"
+#line 19028 "Dialogs.c"
 		{
 			GeeArrayList* _pf_list = NULL;
 			GeeArrayList* _tmp5_ = NULL;
@@ -19370,25 +19051,25 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
 			gint _pf_index = 0;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = self->priv->path_formats;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = _g_object_ref0 (_tmp5_);
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_pf_list = _tmp6_;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = _pf_list;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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));
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = _tmp8_;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_pf_size = _tmp9_;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_pf_index = -1;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 19375 "Dialogs.c"
+#line 19056 "Dialogs.c"
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
 				gint _tmp12_ = 0;
@@ -19400,64 +19081,64 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 				const gchar* _tmp17_ = NULL;
 				const gchar* _tmp18_ = NULL;
 				gint _tmp21_ = 0;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = _pf_index;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_pf_index = _tmp10_ + 1;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = _pf_index;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = _pf_size;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp11_ < _tmp12_)) {
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 19399 "Dialogs.c"
+#line 19080 "Dialogs.c"
 				}
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = _pf_list;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp14_ = _pf_index;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_);
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				pf = (PreferencesDialogPathFormat*) _tmp15_;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp16_ = pf;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp17_ = _tmp16_->pattern;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp18_ = pattern;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 19417 "Dialogs.c"
+#line 19098 "Dialogs.c"
 					GtkComboBox* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp19_ = combo_box;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp20_ = i;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_combo_box_set_active (_tmp19_, _tmp20_);
-#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2475 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					found = TRUE;
-#line 2486 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_preferences_dialog_path_format_unref0 (pf);
-#line 2486 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 19432 "Dialogs.c"
+#line 19113 "Dialogs.c"
 				}
-#line 2488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = i;
-#line 2488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				i = _tmp21_ + 1;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_preferences_dialog_path_format_unref0 (pf);
-#line 19440 "Dialogs.c"
+#line 19121 "Dialogs.c"
 			}
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_pf_list);
-#line 19444 "Dialogs.c"
+#line 19125 "Dialogs.c"
 		}
 	} else {
 		gchar* s = NULL;
@@ -19467,64 +19148,64 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 		gchar* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
 		gboolean _tmp27_ = FALSE;
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = config_facade_get_instance ();
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = _tmp22_;
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = _tmp24_;
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp23_);
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		s = _tmp25_;
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = s;
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = is_string_empty (_tmp26_);
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (!_tmp27_) {
-#line 19472 "Dialogs.c"
+#line 19153 "Dialogs.c"
 			GtkComboBox* _tmp28_ = NULL;
 			GeeArrayList* _tmp29_ = NULL;
 			gint _tmp30_ = 0;
 			gint _tmp31_ = 0;
-#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = combo_box;
-#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = self->priv->path_formats;
-#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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));
-#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = _tmp30_;
-#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_combo_box_set_active (_tmp28_, _tmp31_ - 1);
-#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			found = TRUE;
-#line 19489 "Dialogs.c"
+#line 19170 "Dialogs.c"
 		}
-#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (s);
-#line 19493 "Dialogs.c"
+#line 19174 "Dialogs.c"
 	}
-#line 2499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = found;
-#line 2499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp32_) {
-#line 19499 "Dialogs.c"
+#line 19180 "Dialogs.c"
 		GtkComboBox* _tmp33_ = NULL;
-#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = combo_box;
-#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (_tmp33_, 0);
-#line 19505 "Dialogs.c"
+#line 19186 "Dialogs.c"
 	}
-#line 2503 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_combo_changed (self);
-#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (pattern);
-#line 19511 "Dialogs.c"
+#line 19192 "Dialogs.c"
 }
 
 
@@ -19541,55 +19222,55 @@ void preferences_dialog_show (void) {
 	gchar* _tmp10_ = NULL;
 	PreferencesDialog* _tmp11_ = NULL;
 	GtkDialog* _tmp12_ = NULL;
-#line 2507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = preferences_dialog_preferences_dialog;
-#line 2507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 19532 "Dialogs.c"
+#line 19213 "Dialogs.c"
 		PreferencesDialog* _tmp1_ = NULL;
-#line 2508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = preferences_dialog_new ();
-#line 2508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_preferences_dialog_unref0 (preferences_dialog_preferences_dialog);
-#line 2508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_preferences_dialog = _tmp1_;
-#line 19540 "Dialogs.c"
+#line 19221 "Dialogs.c"
 	}
-#line 2510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_preferences_dialog;
-#line 2510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_preference_options (_tmp2_);
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = preferences_dialog_preferences_dialog;
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_->priv->dialog;
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = preferences_dialog_preferences_dialog;
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_->priv->library_dir_button;
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = app_dirs_get_import_dir ();
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = g_file_get_path (_tmp8_);
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp10_);
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp8_);
-#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = preferences_dialog_preferences_dialog;
-#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_->priv->dialog;
-#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow));
-#line 19576 "Dialogs.c"
+#line 19257 "Dialogs.c"
 }
 
 
@@ -19614,113 +19295,113 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 	gpointer _tmp25_ = NULL;
 	PreferencesDialogPathFormat* _tmp26_ = NULL;
 	const gchar* _tmp27_ = NULL;
-#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	config_facade_commit_bg_color (_tmp1_);
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->builder;
-#line 2524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_builder_get_object (_tmp2_, "autoimport");
-#line 2524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp3_) : NULL);
-#line 2524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	autoimport = _tmp4_;
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = autoimport;
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 19623 "Dialogs.c"
+#line 19304 "Dialogs.c"
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		GtkCheckButton* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp6_;
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = autoimport;
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 19643 "Dialogs.c"
+#line 19324 "Dialogs.c"
 	}
-#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->builder;
-#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = gtk_builder_get_object (_tmp11_, "write_metadata");
-#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp12_) : NULL);
-#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	commit_metadata = _tmp13_;
-#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = commit_metadata;
-#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ != NULL) {
-#line 19657 "Dialogs.c"
+#line 19338 "Dialogs.c"
 		ConfigFacade* _tmp15_ = NULL;
 		ConfigFacade* _tmp16_ = NULL;
 		GtkCheckButton* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
 		gboolean _tmp19_ = FALSE;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = config_facade_get_instance ();
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = _tmp15_;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = commit_metadata;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp18_;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp19_);
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp16_);
-#line 19677 "Dialogs.c"
+#line 19358 "Dialogs.c"
 	}
-#line 2532 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->lib_dir;
-#line 2532 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp20_ != NULL) {
-#line 19683 "Dialogs.c"
+#line 19364 "Dialogs.c"
 		const gchar* _tmp21_ = NULL;
-#line 2533 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->lib_dir;
-#line 2533 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		app_dirs_set_import_dir (_tmp21_);
-#line 19689 "Dialogs.c"
+#line 19370 "Dialogs.c"
 	}
-#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->path_formats;
-#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = self->priv->dir_pattern_combo;
-#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp24_);
-#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pf = (PreferencesDialogPathFormat*) _tmp25_;
-#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = pf;
-#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = _tmp26_->pattern;
-#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL == _tmp27_) {
-#line 19707 "Dialogs.c"
+#line 19388 "Dialogs.c"
 		ConfigFacade* _tmp28_ = NULL;
 		ConfigFacade* _tmp29_ = NULL;
 		GtkEntry* _tmp30_ = NULL;
@@ -19728,55 +19409,55 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 		const gchar* _tmp32_ = NULL;
 		ConfigFacade* _tmp33_ = NULL;
 		ConfigFacade* _tmp34_ = NULL;
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = config_facade_get_instance ();
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = _tmp28_;
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = self->priv->dir_pattern_entry;
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = gtk_entry_get_text (_tmp30_);
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = _tmp31_;
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp32_);
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp29_);
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = config_facade_get_instance ();
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = _tmp33_;
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), NULL);
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp34_);
-#line 19737 "Dialogs.c"
+#line 19418 "Dialogs.c"
 	} else {
 		ConfigFacade* _tmp35_ = NULL;
 		ConfigFacade* _tmp36_ = NULL;
 		PreferencesDialogPathFormat* _tmp37_ = NULL;
 		const gchar* _tmp38_ = NULL;
-#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = config_facade_get_instance ();
-#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp36_ = _tmp35_;
-#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp37_ = pf;
-#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp38_ = _tmp37_->pattern;
-#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp38_);
-#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp36_);
-#line 19755 "Dialogs.c"
+#line 19436 "Dialogs.c"
 	}
-#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (commit_metadata);
-#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (autoimport);
-#line 19763 "Dialogs.c"
+#line 19444 "Dialogs.c"
 }
 
 
@@ -19785,52 +19466,52 @@ static gboolean preferences_dialog_on_delete (PreferencesDialog* self) {
 	gboolean _tmp0_ = FALSE;
 	GtkDialog* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2544 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2545 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = preferences_dialog_get_allow_closing (self);
-#line 2545 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp0_) {
-#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = TRUE;
-#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 19782 "Dialogs.c"
+#line 19463 "Dialogs.c"
 	}
-#line 2548 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_commit_on_close (self);
-#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dialog;
-#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_widget_hide_on_delete (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp2_;
-#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 19794 "Dialogs.c"
+#line 19475 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_close (PreferencesDialog* self) {
 	gboolean _tmp0_ = FALSE;
 	GtkDialog* _tmp1_ = NULL;
-#line 2552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = preferences_dialog_get_allow_closing (self);
-#line 2553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp0_) {
-#line 2554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 19809 "Dialogs.c"
+#line 19490 "Dialogs.c"
 	}
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dialog;
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_commit_on_close (self);
-#line 19817 "Dialogs.c"
+#line 19498 "Dialogs.c"
 }
 
 
@@ -19839,19 +19520,19 @@ static void preferences_dialog_on_value_changed (PreferencesDialog* self) {
 	gdouble _tmp1_ = 0.0;
 	GtkAdjustment* _tmp2_ = NULL;
 	gdouble _tmp3_ = 0.0;
-#line 2560 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->bg_color_adjustment;
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_adjustment_get_upper (_tmp0_);
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->bg_color_adjustment;
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_adjustment_get_value (_tmp2_);
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_set_background_color (self, ((gdouble) (_tmp1_ - _tmp3_)) / 65535.0);
-#line 19838 "Dialogs.c"
+#line 19519 "Dialogs.c"
 }
 
 
@@ -19861,84 +19542,84 @@ static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, G
 	gboolean _tmp1_ = FALSE;
 	GdkEventButton* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 2565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = event;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_->button;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == ((guint) 1)) {
-#line 19858 "Dialogs.c"
+#line 19539 "Dialogs.c"
 		GdkEventButton* _tmp4_ = NULL;
 		GdkEventType _tmp5_ = 0;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = event;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp4_->type;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp5_ == GDK_BUTTON_PRESS;
-#line 19867 "Dialogs.c"
+#line 19548 "Dialogs.c"
 	} else {
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = FALSE;
-#line 19871 "Dialogs.c"
+#line 19552 "Dialogs.c"
 	}
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 19875 "Dialogs.c"
+#line 19556 "Dialogs.c"
 		GdkEventButton* _tmp6_ = NULL;
 		GdkModifierType _tmp7_ = 0;
 		gboolean _tmp8_ = FALSE;
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = event;
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp6_->state;
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = has_only_key_modifier (_tmp7_, GDK_CONTROL_MASK);
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp8_;
-#line 19887 "Dialogs.c"
+#line 19568 "Dialogs.c"
 	} else {
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 19891 "Dialogs.c"
+#line 19572 "Dialogs.c"
 	}
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 19895 "Dialogs.c"
+#line 19576 "Dialogs.c"
 		GtkScale* _tmp9_ = NULL;
 		GtkAdjustment* _tmp10_ = NULL;
 		gdouble _tmp11_ = 0.0;
 		GdkRGBA _tmp12_ = {0};
 		gdouble _tmp13_ = 0.0;
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->bg_color_slider;
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->bg_color_adjustment;
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = gtk_adjustment_get_upper (_tmp10_);
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		parse_color (CONFIG_FACADE_DEFAULT_BG_COLOR, &_tmp12_);
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp12_.red;
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp11_ - (_tmp13_ * 65536.0f));
-#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_on_value_changed (self);
-#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = TRUE;
-#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 19919 "Dialogs.c"
+#line 19600 "Dialogs.c"
 	}
-#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
-#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 19925 "Dialogs.c"
+#line 19606 "Dialogs.c"
 }
 
 
@@ -19950,25 +19631,25 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
 	gpointer _tmp3_ = NULL;
 	PreferencesDialogPathFormat* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 2579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->path_formats;
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dir_pattern_combo;
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp2_);
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pf = (PreferencesDialogPathFormat*) _tmp3_;
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = pf;
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_->pattern;
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL == _tmp5_) {
-#line 19955 "Dialogs.c"
+#line 19636 "Dialogs.c"
 		gchar* dir_pattern = NULL;
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
@@ -19980,78 +19661,78 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
 		const gchar* _tmp14_ = NULL;
 		GtkEntry* _tmp15_ = NULL;
 		GtkEntry* _tmp16_ = NULL;
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp6_;
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = _tmp8_;
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dir_pattern = _tmp9_;
-#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = dir_pattern;
-#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = is_string_empty (_tmp10_);
-#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp11_) {
-#line 19985 "Dialogs.c"
+#line 19666 "Dialogs.c"
 			gchar* _tmp12_ = NULL;
-#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = g_strdup ("");
-#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (dir_pattern);
-#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			dir_pattern = _tmp12_;
-#line 19993 "Dialogs.c"
+#line 19674 "Dialogs.c"
 		}
-#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->dir_pattern_entry;
-#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = dir_pattern;
-#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_text (_tmp13_, _tmp14_);
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2577 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->dir_pattern_entry;
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2577 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_set (_tmp15_, "editable", TRUE, NULL);
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2578 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = self->priv->dir_pattern_entry;
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2578 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (dir_pattern);
-#line 20011 "Dialogs.c"
+#line 19692 "Dialogs.c"
 	} else {
 		GtkEntry* _tmp17_ = NULL;
 		PreferencesDialogPathFormat* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
 		GtkEntry* _tmp20_ = NULL;
 		GtkEntry* _tmp21_ = NULL;
-#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = self->priv->dir_pattern_entry;
-#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = pf;
-#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp18_->pattern;
-#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_text (_tmp17_, _tmp19_);
-#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = self->priv->dir_pattern_entry;
-#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_set (_tmp20_, "editable", FALSE, NULL);
-#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->dir_pattern_entry;
-#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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 20034 "Dialogs.c"
+#line 19715 "Dialogs.c"
 	}
-#line 2579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 20038 "Dialogs.c"
+#line 19719 "Dialogs.c"
 }
 
 
@@ -20065,92 +19746,92 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog*
 	gboolean _tmp5_ = FALSE;
 	const gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->example_date;
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dir_pattern_entry;
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_date_time_format (_tmp0_, _tmp3_);
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	example = _tmp4_;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = example;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = is_string_empty (_tmp6_);
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp7_) {
-#line 20072 "Dialogs.c"
+#line 19753 "Dialogs.c"
 		GtkEntry* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->dir_pattern_entry;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gtk_entry_get_text (_tmp8_);
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = is_string_empty (_tmp10_);
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = !_tmp11_;
-#line 20087 "Dialogs.c"
+#line 19768 "Dialogs.c"
 	} else {
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = FALSE;
-#line 20091 "Dialogs.c"
+#line 19772 "Dialogs.c"
 	}
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 20095 "Dialogs.c"
+#line 19776 "Dialogs.c"
 		GtkLabel* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		GtkEntry* _tmp14_ = NULL;
 		GtkEntry* _tmp15_ = NULL;
-#line 2600 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->dir_pattern_example;
-#line 2600 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _ ("Invalid pattern");
-#line 2600 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_text (_tmp12_, _tmp13_);
-#line 2601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = self->priv->dir_pattern_entry;
-#line 2601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_icon_from_icon_name (_tmp14_, GTK_ENTRY_ICON_SECONDARY, "dialog-error");
-#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->dir_pattern_entry;
-#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_icon_activatable (_tmp15_, GTK_ENTRY_ICON_SECONDARY, FALSE);
-#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_set_allow_closing (self, FALSE);
-#line 20116 "Dialogs.c"
+#line 19797 "Dialogs.c"
 	} else {
 		GtkLabel* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
 		GtkEntry* _tmp18_ = NULL;
-#line 2606 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = self->priv->dir_pattern_example;
-#line 2606 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = example;
-#line 2606 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_text (_tmp16_, _tmp17_);
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->dir_pattern_entry;
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_icon_from_icon_name (_tmp18_, GTK_ENTRY_ICON_SECONDARY, NULL);
-#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_set_allow_closing (self, TRUE);
-#line 20133 "Dialogs.c"
+#line 19814 "Dialogs.c"
 	}
-#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (example);
-#line 20137 "Dialogs.c"
+#line 19818 "Dialogs.c"
 }
 
 
@@ -20158,34 +19839,34 @@ static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gbool
 	GtkDialog* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->dialog;
-#line 2613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = allow;
-#line 2613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_deletable (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_window_get_type (), GtkWindow), _tmp1_);
-#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = allow;
-#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->allow_closing = _tmp2_;
-#line 20157 "Dialogs.c"
+#line 19838 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 2617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->allow_closing;
-#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp0_;
-#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20172 "Dialogs.c"
+#line 19853 "Dialogs.c"
 }
 
 
@@ -20194,21 +19875,21 @@ static void preferences_dialog_set_background_color (PreferencesDialog* self, gd
 	ConfigFacade* _tmp1_ = NULL;
 	gdouble _tmp2_ = 0.0;
 	GdkRGBA _tmp3_ = {0};
-#line 2621 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = bg_color_value;
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_to_grayscale (self, _tmp2_, &_tmp3_);
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	config_facade_set_bg_color (_tmp1_, &_tmp3_);
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20195 "Dialogs.c"
+#line 19876 "Dialogs.c"
 }
 
 
@@ -20217,29 +19898,29 @@ static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble co
 	gdouble _tmp0_ = 0.0;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 2625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	memset (&color, 0, sizeof (GdkRGBA));
-#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = color_value;
-#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.red = _tmp0_;
-#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = color_value;
-#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.green = _tmp1_;
-#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2620 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = color_value;
-#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2620 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.blue = _tmp2_;
-#line 2631 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.alpha = 1.0;
-#line 2633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	*result = color;
-#line 2633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return;
-#line 20226 "Dialogs.c"
+#line 19907 "Dialogs.c"
 }
 
 
@@ -20260,77 +19941,77 @@ static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self)
 	gchar* _tmp16_ = NULL;
 	gchar* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
-#line 2636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->photo_editor_combo;
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->external_photo_apps;
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ < _tmp5_) {
-#line 20261 "Dialogs.c"
+#line 19942 "Dialogs.c"
 		GtkComboBox* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->photo_editor_combo;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp7_;
-#line 20270 "Dialogs.c"
+#line 19951 "Dialogs.c"
 	} else {
 		SortedList* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->external_photo_apps;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp10_;
-#line 20283 "Dialogs.c"
+#line 19964 "Dialogs.c"
 	}
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	photo_app_choice_index = _tmp0_;
-#line 2640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->external_photo_apps;
-#line 2640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = sorted_list_get_at (_tmp11_, photo_app_choice_index);
-#line 2640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	app = (GAppInfo*) _tmp12_;
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = config_facade_get_instance ();
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = desktop_integration_get_app_open_command (app);
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = _tmp15_;
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp16_);
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp16_);
-#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = desktop_integration_get_app_open_command (app);
-#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = _tmp17_;
-#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2644: setting external photo editor to: %s", _tmp18_);
-#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_debug ("Dialogs.vala:2634: setting external photo editor to: %s", _tmp18_);
+#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp18_);
-#line 2636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (app);
-#line 20317 "Dialogs.c"
+#line 19998 "Dialogs.c"
 }
 
 
@@ -20349,69 +20030,69 @@ static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) {
 	ConfigFacade* _tmp14_ = NULL;
 	const gchar* _tmp15_ = NULL;
 	const gchar* _tmp16_ = NULL;
-#line 2647 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->raw_editor_combo;
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->external_raw_apps;
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ < _tmp5_) {
-#line 20350 "Dialogs.c"
+#line 20031 "Dialogs.c"
 		GtkComboBox* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->raw_editor_combo;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp7_;
-#line 20359 "Dialogs.c"
+#line 20040 "Dialogs.c"
 	} else {
 		SortedList* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->external_raw_apps;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp10_;
-#line 20372 "Dialogs.c"
+#line 20053 "Dialogs.c"
 	}
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	raw_app_choice_index = _tmp0_;
-#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->external_raw_apps;
-#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = sorted_list_get_at (_tmp11_, raw_app_choice_index);
-#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	app = (GAppInfo*) _tmp12_;
-#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = config_facade_get_instance ();
-#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = g_app_info_get_commandline (app);
-#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_);
-#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = g_app_info_get_commandline (app);
-#line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2655: setting external raw editor to: %s", _tmp16_);
-#line 2647 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	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 20398 "Dialogs.c"
+#line 20079 "Dialogs.c"
 }
 
 
@@ -20419,50 +20100,50 @@ static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDial
 	RawDeveloper result = 0;
 	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 2658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), 0);
-#line 2659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->default_raw_developer_combo;
-#line 2659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == 0) {
-#line 2660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = RAW_DEVELOPER_CAMERA;
-#line 2660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 20418 "Dialogs.c"
+#line 20099 "Dialogs.c"
 	}
-#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = RAW_DEVELOPER_SHOTWELL;
-#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20424 "Dialogs.c"
+#line 20105 "Dialogs.c"
 }
 
 
 static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, RawDeveloper d) {
 	RawDeveloper _tmp0_ = 0;
-#line 2664 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = d;
-#line 2665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == RAW_DEVELOPER_CAMERA) {
-#line 20436 "Dialogs.c"
+#line 20117 "Dialogs.c"
 		GtkComboBoxText* _tmp1_ = NULL;
-#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->default_raw_developer_combo;
-#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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 20442 "Dialogs.c"
+#line 20123 "Dialogs.c"
 	} else {
 		GtkComboBoxText* _tmp2_ = NULL;
-#line 2668 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = self->priv->default_raw_developer_combo;
-#line 2668 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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 20449 "Dialogs.c"
+#line 20130 "Dialogs.c"
 	}
 }
 
@@ -20471,60 +20152,60 @@ static void preferences_dialog_on_default_raw_developer_changed (PreferencesDial
 	ConfigFacade* _tmp0_ = NULL;
 	ConfigFacade* _tmp1_ = NULL;
 	RawDeveloper _tmp2_ = 0;
-#line 2671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_raw_developer_from_combo (self);
-#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
-#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20470 "Dialogs.c"
+#line 20151 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_current_folder_changed (PreferencesDialog* self) {
 	GtkFileChooserButton* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->library_dir_button;
-#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->priv->lib_dir);
-#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->lib_dir = _tmp1_;
-#line 20487 "Dialogs.c"
+#line 20168 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self) {
-#line 2684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_current_folder_changed ((PreferencesDialog*) self);
-#line 20494 "Dialogs.c"
+#line 20175 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_map_event (PreferencesDialog* self) {
 	gboolean result = FALSE;
 	GtkFileChooserButton* _tmp0_ = NULL;
-#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2669 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->library_dir_button;
-#line 2684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "current-folder-changed", (GCallback) _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed, self);
-#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20511 "Dialogs.c"
+#line 20192 "Dialogs.c"
 }
 
 
@@ -20536,31 +20217,31 @@ static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, cons
 	GeeArrayList* _tmp3_ = NULL;
 	GtkComboBoxText* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 2688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (name != NULL);
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = name;
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = pattern;
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_path_format_new (_tmp0_, _tmp1_);
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pf = _tmp2_;
-#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->path_formats;
-#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), pf);
-#line 2691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = self->priv->dir_pattern_combo;
-#line 2691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = name;
-#line 2691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _tmp5_);
-#line 2688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 20547 "Dialogs.c"
+#line 20228 "Dialogs.c"
 }
 
 
@@ -20569,21 +20250,21 @@ static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) {
 	ConfigFacade* _tmp1_ = NULL;
 	GtkCheckButton* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->lowercase;
-#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
-#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20570 "Dialogs.c"
+#line 20251 "Dialogs.c"
 }
 
 
@@ -20593,246 +20274,246 @@ static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GT
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (PreferencesDialogPathFormat*) g_type_create_instance (object_type);
-#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = name;
-#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->name);
-#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->name = _tmp1_;
-#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = pattern;
-#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->pattern);
-#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->pattern = _tmp3_;
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 20602 "Dialogs.c"
+#line 20283 "Dialogs.c"
 }
 
 
 static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern) {
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return preferences_dialog_path_format_construct (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, name, pattern);
-#line 20609 "Dialogs.c"
+#line 20290 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_path_format_init (GValue* value) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 20616 "Dialogs.c"
+#line 20297 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_path_format_free_value (GValue* value) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (value->data[0].v_pointer);
-#line 20625 "Dialogs.c"
+#line 20306 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_value_path_format_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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 20635 "Dialogs.c"
+#line 20316 "Dialogs.c"
 	} else {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 20639 "Dialogs.c"
+#line 20320 "Dialogs.c"
 	}
 }
 
 
 static gpointer preferences_dialog_value_path_format_peek_pointer (const GValue* value) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20647 "Dialogs.c"
+#line 20328 "Dialogs.c"
 }
 
 
 static gchar* preferences_dialog_value_path_format_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 20654 "Dialogs.c"
+#line 20335 "Dialogs.c"
 		PreferencesDialogPathFormat* object;
 		object = collect_values[0].v_pointer;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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 20661 "Dialogs.c"
+#line 20342 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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 20665 "Dialogs.c"
+#line 20346 "Dialogs.c"
 		}
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = preferences_dialog_path_format_ref (object);
-#line 20669 "Dialogs.c"
+#line 20350 "Dialogs.c"
 	} else {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20673 "Dialogs.c"
+#line 20354 "Dialogs.c"
 	}
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20677 "Dialogs.c"
+#line 20358 "Dialogs.c"
 }
 
 
 static gchar* preferences_dialog_value_path_format_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PreferencesDialogPathFormat** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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 20688 "Dialogs.c"
+#line 20369 "Dialogs.c"
 	}
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 20694 "Dialogs.c"
+#line 20375 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 20698 "Dialogs.c"
+#line 20379 "Dialogs.c"
 	} else {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 20702 "Dialogs.c"
+#line 20383 "Dialogs.c"
 	}
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20706 "Dialogs.c"
+#line 20387 "Dialogs.c"
 }
 
 
 static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PreferencesDialogParamSpecPathFormat* spec;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 20720 "Dialogs.c"
+#line 20401 "Dialogs.c"
 }
 
 
 static gpointer preferences_dialog_value_get_path_format (const GValue* value) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20729 "Dialogs.c"
+#line 20410 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_object) {
 	PreferencesDialogPathFormat* old;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 20749 "Dialogs.c"
+#line 20430 "Dialogs.c"
 	} else {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20753 "Dialogs.c"
+#line 20434 "Dialogs.c"
 	}
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (old);
-#line 20759 "Dialogs.c"
+#line 20440 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_value_take_path_format (GValue* value, gpointer v_object) {
 	PreferencesDialogPathFormat* old;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 20778 "Dialogs.c"
+#line 20459 "Dialogs.c"
 	} else {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20782 "Dialogs.c"
+#line 20463 "Dialogs.c"
 	}
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (old);
-#line 20788 "Dialogs.c"
+#line 20469 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_path_format_class_init (PreferencesDialogPathFormatClass * klass) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_path_format_parent_class = g_type_class_peek_parent (klass);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((PreferencesDialogPathFormatClass *) klass)->finalize = preferences_dialog_path_format_finalize;
-#line 20798 "Dialogs.c"
+#line 20479 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_instance_init (PreferencesDialogPathFormat * self) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 20805 "Dialogs.c"
+#line 20486 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat* obj) {
 	PreferencesDialogPathFormat * self;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormat);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 2280 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->name);
-#line 2281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->pattern);
-#line 20819 "Dialogs.c"
+#line 20500 "Dialogs.c"
 }
 
 
@@ -20853,216 +20534,216 @@ static GType preferences_dialog_path_format_get_type (void) {
 static gpointer preferences_dialog_path_format_ref (gpointer instance) {
 	PreferencesDialogPathFormat* self;
 	self = instance;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 20844 "Dialogs.c"
+#line 20525 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_unref (gpointer instance) {
 	PreferencesDialogPathFormat* self;
 	self = instance;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		PREFERENCES_DIALOG_PATH_FORMAT_GET_CLASS (self)->finalize (self);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 20857 "Dialogs.c"
+#line 20538 "Dialogs.c"
 	}
 }
 
 
 static void value_preferences_dialog_init (GValue* value) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 20865 "Dialogs.c"
+#line 20546 "Dialogs.c"
 }
 
 
 static void value_preferences_dialog_free_value (GValue* value) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (value->data[0].v_pointer);
-#line 20874 "Dialogs.c"
+#line 20555 "Dialogs.c"
 	}
 }
 
 
 static void value_preferences_dialog_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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 20884 "Dialogs.c"
+#line 20565 "Dialogs.c"
 	} else {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 20888 "Dialogs.c"
+#line 20569 "Dialogs.c"
 	}
 }
 
 
 static gpointer value_preferences_dialog_peek_pointer (const GValue* value) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20896 "Dialogs.c"
+#line 20577 "Dialogs.c"
 }
 
 
 static gchar* value_preferences_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 20903 "Dialogs.c"
+#line 20584 "Dialogs.c"
 		PreferencesDialog* object;
 		object = collect_values[0].v_pointer;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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 20910 "Dialogs.c"
+#line 20591 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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 20914 "Dialogs.c"
+#line 20595 "Dialogs.c"
 		}
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = preferences_dialog_ref (object);
-#line 20918 "Dialogs.c"
+#line 20599 "Dialogs.c"
 	} else {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20922 "Dialogs.c"
+#line 20603 "Dialogs.c"
 	}
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20926 "Dialogs.c"
+#line 20607 "Dialogs.c"
 }
 
 
 static gchar* value_preferences_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PreferencesDialog** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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 20937 "Dialogs.c"
+#line 20618 "Dialogs.c"
 	}
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 20943 "Dialogs.c"
+#line 20624 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 20947 "Dialogs.c"
+#line 20628 "Dialogs.c"
 	} else {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = preferences_dialog_ref (value->data[0].v_pointer);
-#line 20951 "Dialogs.c"
+#line 20632 "Dialogs.c"
 	}
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20955 "Dialogs.c"
+#line 20636 "Dialogs.c"
 }
 
 
 GParamSpec* param_spec_preferences_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPreferencesDialog* spec;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PREFERENCES_DIALOG), NULL);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 20969 "Dialogs.c"
+#line 20650 "Dialogs.c"
 }
 
 
 gpointer value_get_preferences_dialog (const GValue* value) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG), NULL);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20978 "Dialogs.c"
+#line 20659 "Dialogs.c"
 }
 
 
 void value_set_preferences_dialog (GValue* value, gpointer v_object) {
 	PreferencesDialog* old;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG));
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREFERENCES_DIALOG));
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_ref (value->data[0].v_pointer);
-#line 20998 "Dialogs.c"
+#line 20679 "Dialogs.c"
 	} else {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 21002 "Dialogs.c"
+#line 20683 "Dialogs.c"
 	}
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (old);
-#line 21008 "Dialogs.c"
+#line 20689 "Dialogs.c"
 	}
 }
 
 
 void value_take_preferences_dialog (GValue* value, gpointer v_object) {
 	PreferencesDialog* old;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG));
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREFERENCES_DIALOG));
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 21027 "Dialogs.c"
+#line 20708 "Dialogs.c"
 	} else {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 21031 "Dialogs.c"
+#line 20712 "Dialogs.c"
 	}
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (old);
-#line 21037 "Dialogs.c"
+#line 20718 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_class_init (PreferencesDialogClass * klass) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((PreferencesDialogClass *) klass)->finalize = preferences_dialog_finalize;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (PreferencesDialogPrivate));
-#line 21049 "Dialogs.c"
+#line 20730 "Dialogs.c"
 }
 
 
@@ -21070,73 +20751,73 @@ static void preferences_dialog_instance_init (PreferencesDialog * self) {
 	GeeArrayList* _tmp0_ = NULL;
 	GDateTime* _tmp1_ = NULL;
 	PluginsManifestWidgetMediator* _tmp2_ = NULL;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = PREFERENCES_DIALOG_GET_PRIVATE (self);
-#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->allow_closing = FALSE;
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->lib_dir = NULL;
-#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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);
-#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->path_formats = _tmp0_;
-#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_date_time_new_local (2009, 3, 10, 18, 16, (gdouble) 11);
-#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->example_date = _tmp1_;
-#line 2303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = plugins_manifest_widget_mediator_new ();
-#line 2303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->plugins_mediator = _tmp2_;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 21077 "Dialogs.c"
+#line 20758 "Dialogs.c"
 }
 
 
 static void preferences_dialog_finalize (PreferencesDialog* obj) {
 	PreferencesDialog * self;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREFERENCES_DIALOG, PreferencesDialog);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 2286 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 2287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_adjustment);
-#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_slider);
-#line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->photo_editor_combo);
-#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->raw_editor_combo);
-#line 2292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_raw_apps);
-#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_photo_apps);
-#line 2294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->library_dir_button);
-#line 2295 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_combo);
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_entry);
-#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_example);
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->priv->lib_dir);
-#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->path_formats);
-#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_date_time_unref0 (self->priv->example_date);
-#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->lowercase);
-#line 2303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_plugins_manifest_widget_mediator_unref0 (self->priv->plugins_mediator);
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->default_raw_developer_combo);
-#line 21123 "Dialogs.c"
+#line 20804 "Dialogs.c"
 }
 
 
@@ -21157,24 +20838,24 @@ GType preferences_dialog_get_type (void) {
 gpointer preferences_dialog_ref (gpointer instance) {
 	PreferencesDialog* self;
 	self = instance;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 21148 "Dialogs.c"
+#line 20829 "Dialogs.c"
 }
 
 
 void preferences_dialog_unref (gpointer instance) {
 	PreferencesDialog* self;
 	self = instance;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		PREFERENCES_DIALOG_GET_CLASS (self)->finalize (self);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 21161 "Dialogs.c"
+#line 20842 "Dialogs.c"
 	}
 }
 
@@ -21194,54 +20875,54 @@ GtkResponseType copy_files_dialog (void) {
 	const gchar* _tmp8_ = NULL;
 	GtkResponseType _result_ = 0;
 	gint _tmp9_ = 0;
-#line 2702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _ ("Shotwell can copy the photos into your library folder or it can import" \
 " them without copying.");
-#line 2702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp1_;
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", msg);
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp4_);
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp5_;
-#line 2707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2697 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("Co_py Photos");
-#line 2707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2697 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp6_, (gint) GTK_RESPONSE_ACCEPT);
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _ ("_Import in Place");
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp7_, (gint) GTK_RESPONSE_REJECT);
-#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _ ("Import to Library");
-#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _tmp8_);
-#line 2711 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2701 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 2711 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2701 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp9_;
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2703 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 21227 "Dialogs.c"
+#line 20908 "Dialogs.c"
 }
 
 
@@ -21252,47 +20933,47 @@ void remove_photos_from_library (GeeCollection* photos) {
 	gint _tmp3_ = 0;
 	GeeCollection* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (photos));
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = photos;
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gee_collection_get_size (_tmp1_);
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == 1) {
-#line 21248 "Dialogs.c"
+#line 20929 "Dialogs.c"
 		const gchar* _tmp4_ = NULL;
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _ ("Removing Photo From Library");
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_;
-#line 21254 "Dialogs.c"
+#line 20935 "Dialogs.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _ ("Removing Photos From Library");
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp5_;
-#line 21261 "Dialogs.c"
+#line 20942 "Dialogs.c"
 	}
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = photos;
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _ ("Remove From Library");
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	remove_from_app (_tmp6_, _tmp7_, _tmp0_);
-#line 21269 "Dialogs.c"
+#line 20950 "Dialogs.c"
 }
 
 
 static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
 	gboolean result;
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 21278 "Dialogs.c"
+#line 20959 "Dialogs.c"
 }
 
 
@@ -21363,71 +21044,71 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 	ProgressDialog* _tmp122_ = NULL;
 	AppWindow* _tmp124_ = NULL;
 	AppWindow* _tmp125_ = NULL;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (dialog_title != NULL);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (progress_dialog_text != NULL);
-#line 2725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = sources;
-#line 2725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 2725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 2725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ == 0) {
-#line 2726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 21365 "Dialogs.c"
+#line 21046 "Dialogs.c"
 	}
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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);
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	photos = _tmp3_;
-#line 2729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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);
-#line 2729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	videos = _tmp4_;
-#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = sources;
-#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = photos;
-#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = videos;
-#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_filter_media (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	user_message = NULL;
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = photos;
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp11_) {
-#line 21393 "Dialogs.c"
+#line 21074 "Dialogs.c"
 		GeeArrayList* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
 		gboolean _tmp14_ = FALSE;
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = videos;
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _tmp13_;
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = !_tmp14_;
-#line 21405 "Dialogs.c"
+#line 21086 "Dialogs.c"
 	} else {
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = FALSE;
-#line 21409 "Dialogs.c"
+#line 21090 "Dialogs.c"
 	}
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_) {
-#line 21413 "Dialogs.c"
+#line 21094 "Dialogs.c"
 		GeeCollection* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
 		gint _tmp17_ = 0;
@@ -21436,13 +21117,13 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		gint _tmp20_ = 0;
 		gint _tmp21_ = 0;
 		gchar* _tmp22_ = NULL;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = sources;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = gee_collection_get_size (_tmp15_);
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = ngettext ("This will remove the photo/video from your Shotwell library. Would you" \
 " also like to move the file to your desktop trash?\n" \
 "\n" \
@@ -21450,32 +21131,32 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 "u also like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp17_);
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = sources;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = gee_collection_get_size (_tmp19_);
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _tmp20_;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = g_strdup_printf (_tmp18_, _tmp21_);
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (user_message);
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		user_message = _tmp22_;
-#line 21442 "Dialogs.c"
+#line 21123 "Dialogs.c"
 	} else {
 		GeeArrayList* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
 		gboolean _tmp25_ = FALSE;
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = videos;
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = _tmp24_;
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (!_tmp25_) {
-#line 21455 "Dialogs.c"
+#line 21136 "Dialogs.c"
 			GeeCollection* _tmp26_ = NULL;
 			gint _tmp27_ = 0;
 			gint _tmp28_ = 0;
@@ -21484,13 +21165,13 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp31_ = 0;
 			gint _tmp32_ = 0;
 			gchar* _tmp33_ = NULL;
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = sources;
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = gee_collection_get_size (_tmp26_);
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = _tmp27_;
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = ngettext ("This will remove the video from your Shotwell library. Would you also " \
 "like to move the file to your desktop trash?\n" \
 "\n" \
@@ -21498,19 +21179,19 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 "like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp28_);
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = sources;
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = gee_collection_get_size (_tmp30_);
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp32_ = _tmp31_;
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp33_ = g_strdup_printf (_tmp29_, _tmp32_);
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (user_message);
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			user_message = _tmp33_;
-#line 21484 "Dialogs.c"
+#line 21165 "Dialogs.c"
 		} else {
 			GeeCollection* _tmp34_ = NULL;
 			gint _tmp35_ = 0;
@@ -21520,13 +21201,13 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp39_ = 0;
 			gint _tmp40_ = 0;
 			gchar* _tmp41_ = NULL;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp34_ = sources;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp35_ = gee_collection_get_size (_tmp34_);
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp36_ = _tmp35_;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp37_ = ngettext ("This will remove the photo from your Shotwell library. Would you also " \
 "like to move the file to your desktop trash?\n" \
 "\n" \
@@ -21534,208 +21215,208 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 "like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp36_);
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp38_ = sources;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp39_ = gee_collection_get_size (_tmp38_);
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp40_ = _tmp39_;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp41_ = g_strdup_printf (_tmp37_, _tmp40_);
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (user_message);
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			user_message = _tmp41_;
-#line 21514 "Dialogs.c"
+#line 21195 "Dialogs.c"
 		}
 	}
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = app_window_get_instance ();
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = _tmp42_;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = dialog_title;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = user_message;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = sources;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = gee_collection_get_size (_tmp46_);
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp48_ = _tmp47_;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = remove_from_library_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_window_get_type (), GtkWindow), _tmp44_, _tmp45_, _tmp48_);
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp50_ = _tmp49_;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp43_);
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = _tmp50_;
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = _result_;
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp52_ != GTK_RESPONSE_YES) {
-#line 21543 "Dialogs.c"
+#line 21224 "Dialogs.c"
 		GtkResponseType _tmp53_ = 0;
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp53_ = _result_;
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = _tmp53_ != GTK_RESPONSE_NO;
-#line 21549 "Dialogs.c"
+#line 21230 "Dialogs.c"
 	} else {
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = FALSE;
-#line 21553 "Dialogs.c"
+#line 21234 "Dialogs.c"
 	}
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp51_) {
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (user_message);
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (videos);
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (photos);
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 21565 "Dialogs.c"
+#line 21246 "Dialogs.c"
 	}
-#line 2752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = _result_;
-#line 2752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	delete_backing = _tmp54_ == GTK_RESPONSE_YES;
-#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp55_ = app_window_get_instance ();
-#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp56_ = _tmp55_;
-#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp56_);
-#line 2756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress = NULL;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor = NULL;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target = NULL;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target_destroy_notify = NULL;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp57_ = sources;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp58_ = gee_collection_get_size (_tmp57_);
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp59_ = _tmp58_;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp59_ >= 20) {
-#line 21595 "Dialogs.c"
+#line 21276 "Dialogs.c"
 		AppWindow* _tmp60_ = NULL;
 		AppWindow* _tmp61_ = NULL;
 		const gchar* _tmp62_ = NULL;
 		ProgressDialog* _tmp63_ = NULL;
 		ProgressDialog* _tmp64_ = NULL;
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp60_ = app_window_get_instance ();
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp61_ = _tmp60_;
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp62_ = progress_dialog_text;
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp63_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_window_get_type (), GtkWindow), _tmp62_, NULL);
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp63_);
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (progress);
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress = _tmp63_;
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp61_);
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp64_ = progress;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor = NULL;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target = NULL;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target_destroy_notify = NULL;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor = _progress_dialog_monitor_progress_monitor;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target = g_object_ref (_tmp64_);
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target_destroy_notify = g_object_unref;
-#line 21633 "Dialogs.c"
+#line 21314 "Dialogs.c"
 	}
-#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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);
-#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	not_removed_photos = _tmp65_;
-#line 2764 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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);
-#line 2764 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	not_removed_videos = _tmp66_;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = library_photo_global;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = photos;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp69_ = delete_backing;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70_ = monitor;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70__target = monitor_target;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp71_ = not_removed_photos;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection), _tmp69_, _tmp70_, _tmp70__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_LIST, GeeList));
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp72_ = video_global;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = videos;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp74_ = delete_backing;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75_ = monitor;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75__target = monitor_target;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp76_ = not_removed_videos;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_COLLECTION, GeeCollection), _tmp74_, _tmp75_, _tmp75__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_LIST, GeeList));
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp77_ = not_removed_photos;
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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));
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp79_ = _tmp78_;
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp80_ = not_removed_videos;
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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));
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp82_ = _tmp81_;
-#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	num_not_removed = _tmp79_ + _tmp82_;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp84_ = delete_backing;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp84_) {
-#line 21689 "Dialogs.c"
+#line 21370 "Dialogs.c"
 		gint _tmp85_ = 0;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = num_not_removed;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = _tmp85_ > 0;
-#line 21695 "Dialogs.c"
+#line 21376 "Dialogs.c"
 	} else {
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = FALSE;
-#line 21699 "Dialogs.c"
+#line 21380 "Dialogs.c"
 	}
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp83_) {
-#line 21703 "Dialogs.c"
+#line 21384 "Dialogs.c"
 		gchar* not_deleted_message = NULL;
 		gint _tmp86_ = 0;
 		const gchar* _tmp87_ = NULL;
@@ -21749,39 +21430,39 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		GtkResponseType _tmp94_ = 0;
 		GtkResponseType _tmp95_ = 0;
 		GtkResponseType _tmp96_ = 0;
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp86_ = num_not_removed;
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp87_ = ngettext ("The photo or video cannot be moved to your desktop trash. Delete this " \
 "file?", "%d photos/videos cannot be moved to your desktop trash. Delete these f" \
 "iles?", (gulong) _tmp86_);
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp88_ = num_not_removed;
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp89_ = g_strdup_printf (_tmp87_, _tmp88_);
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		not_deleted_message = _tmp89_;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp90_ = app_window_get_instance ();
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp91_ = _tmp90_;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = dialog_title;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp93_ = not_deleted_message;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp94_ = remove_from_filesystem_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, gtk_window_get_type (), GtkWindow), _tmp92_, _tmp93_);
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp95_ = _tmp94_;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp91_);
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result_delete = _tmp95_;
-#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp96_ = result_delete;
-#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (GTK_RESPONSE_YES == _tmp96_) {
-#line 21747 "Dialogs.c"
+#line 21428 "Dialogs.c"
 			GeeArrayList* not_deleted_photos = NULL;
 			GeeArrayList* _tmp97_ = NULL;
 			GeeArrayList* not_deleted_videos = NULL;
@@ -21804,57 +21485,57 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp111_ = 0;
 			gint _tmp112_ = 0;
 			gint _tmp113_ = 0;
-#line 2782 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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);
-#line 2782 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			not_deleted_photos = _tmp97_;
-#line 2783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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);
-#line 2783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			not_deleted_videos = _tmp98_;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp99_ = library_photo_global;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp100_ = not_removed_photos;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp101_ = monitor;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp101__target = monitor_target;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp102_ = not_deleted_photos;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection), _tmp101_, _tmp101__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GEE_TYPE_LIST, GeeList));
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp103_ = video_global;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp104_ = not_removed_videos;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp105_ = monitor;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp105__target = monitor_target;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp106_ = not_deleted_videos;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_COLLECTION, GeeCollection), _tmp105_, _tmp105__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_LIST, GeeList));
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp107_ = not_deleted_photos;
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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));
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp109_ = _tmp108_;
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp110_ = not_deleted_videos;
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#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));
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp112_ = _tmp111_;
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			num_not_deleted = _tmp109_ + _tmp112_;
-#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp113_ = num_not_deleted;
-#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp113_ > 0) {
-#line 21820 "Dialogs.c"
+#line 21501 "Dialogs.c"
 				gchar* delete_failed_message = NULL;
 				gint _tmp114_ = 0;
 				const gchar* _tmp115_ = NULL;
@@ -21864,83 +21545,83 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 				const gchar* _tmp119_ = NULL;
 				AppWindow* _tmp120_ = NULL;
 				AppWindow* _tmp121_ = NULL;
-#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp114_ = num_not_deleted;
-#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp115_ = ngettext ("The photo or video cannot be deleted.", "%d photos/videos cannot be deleted.", (gulong) _tmp114_);
-#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp116_ = num_not_deleted;
-#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp117_ = g_strdup_printf (_tmp115_, _tmp116_);
-#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				delete_failed_message = _tmp117_;
-#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp118_ = dialog_title;
-#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp119_ = delete_failed_message;
-#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp120_ = app_window_get_instance ();
-#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp121_ = _tmp120_;
-#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				app_window_error_message_with_title (_tmp118_, _tmp119_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_window_get_type (), GtkWindow), TRUE);
-#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp121_);
-#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (delete_failed_message);
-#line 21854 "Dialogs.c"
+#line 21535 "Dialogs.c"
 			}
-#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (not_deleted_videos);
-#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (not_deleted_photos);
-#line 21860 "Dialogs.c"
+#line 21541 "Dialogs.c"
 		}
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (not_deleted_message);
-#line 21864 "Dialogs.c"
+#line 21545 "Dialogs.c"
 	}
-#line 2799 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp122_ = progress;
-#line 2799 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp122_ != NULL) {
-#line 21870 "Dialogs.c"
+#line 21551 "Dialogs.c"
 		ProgressDialog* _tmp123_ = NULL;
-#line 2800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = progress;
-#line 2800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress_dialog_close (_tmp123_);
-#line 21876 "Dialogs.c"
+#line 21557 "Dialogs.c"
 	}
-#line 2802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp124_ = app_window_get_instance ();
-#line 2802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp125_ = _tmp124_;
-#line 2802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp125_);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (not_removed_videos);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (not_removed_photos);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor = NULL;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target = NULL;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target_destroy_notify = NULL;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (progress);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (user_message);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (videos);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (photos);
-#line 21906 "Dialogs.c"
+#line 21587 "Dialogs.c"
 }
 
 
diff --git a/src/Dialogs.vala b/src/Dialogs.vala
index ffeb9d5..ef26b0e 100644
--- a/src/Dialogs.vala
+++ b/src/Dialogs.vala
@@ -1080,94 +1080,80 @@ public class EntryMultiCompletion : Gtk.EntryCompletion {
     }
 }
 
-public abstract class SetBackgroundDialog {
-    protected Gtk.Dialog dialog;
-    protected Gtk.CheckButton desktop_background_button;
-    protected Gtk.CheckButton screensaver_button;
-    protected Gtk.Button ok_button;
-    // the checkbuttons themselves are initialized to these values
-    protected bool desktop = true;
-    protected bool screensaver = false;
-
-    public SetBackgroundDialog(Gtk.Builder builder) {
-        
-        dialog = builder.get_object("dialog1") as Gtk.Dialog;
-        dialog.set_type_hint(Gdk.WindowTypeHint.DIALOG);
-        dialog.set_parent_window(AppWindow.get_instance().get_parent_window());
-        dialog.set_transient_for(AppWindow.get_instance());
-        dialog.set_default_response(Gtk.ResponseType.OK);
-        
-        desktop_background_button = builder.get_object("desktop_background_checkbox") as Gtk.CheckButton;
-        desktop_background_button.active = desktop;
-        desktop_background_button.toggled.connect(on_checkbox_clicked);
-        screensaver_button = builder.get_object("screensaver_checkbox") as Gtk.CheckButton;
-        screensaver_button.active = screensaver;
-        screensaver_button.toggled.connect(on_checkbox_clicked);
-        
-        ok_button = builder.get_object("ok_button") as Gtk.Button;
-    }
-    
-    protected void on_checkbox_clicked() {
-        desktop = desktop_background_button.active;
-        screensaver = screensaver_button.active;
+[GtkTemplate (ui = "/org/gnome/Shotwell/ui/set_background_dialog.ui")]
+public class SetBackgroundPhotoDialog : Gtk.Dialog {
+    [GtkChild]
+    private Gtk.CheckButton desktop_background_checkbox;
+    [GtkChild]
+    private Gtk.CheckButton screensaver_checkbox;
 
-        if (!desktop && !screensaver) {
-            ok_button.sensitive = false;
-        } else {
-            ok_button.sensitive = true;
-        }
-    }
-    
-    protected bool execute_base() {
-        dialog.show_all();
-        bool result = dialog.run() == Gtk.ResponseType.OK;
-        dialog.destroy();
-        
-        return result;
+    public SetBackgroundPhotoDialog() {
+        bool use_header;
+        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
+        Object(use_header_bar: use_header ? 1 : 0);
+        this.set_transient_for (AppWindow.get_instance());
     }
-}
 
-public class SetBackgroundPhotoDialog : SetBackgroundDialog {
-    
-    public SetBackgroundPhotoDialog() {
-        Gtk.Builder builder = AppWindow.create_builder("set_background_dialog.ui", this);
-        base(builder);
+    [GtkCallback]
+    private void on_checkbox_clicked() {
+        set_response_sensitive (Gtk.ResponseType.OK,
+                                desktop_background_checkbox.active ||
+                                screensaver_checkbox.active);
     }
-    
+
     public bool execute(out bool desktop_background, out bool screensaver) {
-        bool result = execute_base();
-        
-        desktop_background = this.desktop;
-        screensaver = this.screensaver;
-        
+        this.show_all();
+        var result = this.run() == Gtk.ResponseType.OK;
+        this.hide ();
+
+        desktop_background = desktop_background_checkbox.active;
+        screensaver = screensaver_checkbox.active;
+
+        this.destroy();
         return result;
     }
 }
 
-public class SetBackgroundSlideshowDialog : SetBackgroundDialog {
-    private Gtk.Label delay_value_label;
+[GtkTemplate (ui = "/org/gnome/Shotwell/ui/set_background_slideshow_dialog.ui")]
+public class SetBackgroundSlideshowDialog : Gtk.Dialog {
+    [GtkChild]
+    private Gtk.CheckButton desktop_background_checkbox;
+    [GtkChild]
+    private Gtk.CheckButton screensaver_checkbox;
+    [GtkChild]
     private Gtk.Scale delay_scale;
+    [GtkChild]
+    private Gtk.Label delay_value_label;
+
     private int delay_value = 0;
-    
+
     public SetBackgroundSlideshowDialog() {
-        Gtk.Builder builder = AppWindow.create_builder("set_background_slideshow_dialog.ui", this);
-        base(builder);
-        
-        delay_value_label = builder.get_object("delay_value_label") as Gtk.Label;
-        
-        delay_scale = builder.get_object("delay_scale") as Gtk.Scale;
-        delay_scale.value_changed.connect(on_delay_scale_value_changed);
-        delay_scale.adjustment.value = 50;
+        bool use_header;
+        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
+        Object(use_header_bar: use_header ? 1 : 0);
+        this.set_transient_for (AppWindow.get_instance());
     }
-    
+
+    public override void constructed () {
+        on_delay_scale_value_changed ();
+    }
+
+    [GtkCallback]
+    private void on_checkbox_clicked() {
+        set_response_sensitive (Gtk.ResponseType.OK,
+                                desktop_background_checkbox.active ||
+                                screensaver_checkbox.active);
+    }
+
+    [GtkCallback]
     private void on_delay_scale_value_changed() {
         double value = delay_scale.adjustment.value;
-        
+
         // f(x)=x^5 allows to have fine-grained values (seconds) to the left
         // and very coarse-grained values (hours) to the right of the slider.
         // We limit maximum value to 1 day and minimum to 5 seconds.
         delay_value = (int) (Math.pow(value, 5) / Math.pow(90, 5) * 60 * 60 * 24 + 5);
-        
+
         // convert to text and remove fractions from values > 1 minute
         string text;
         if (delay_value < 60) {
@@ -1184,21 +1170,25 @@ public class SetBackgroundSlideshowDialog : SetBackgroundDialog {
             text = _("1 day");
             delay_value = 60 * 60 * 24;
         }
-        
+
         delay_value_label.label = text;
     }
-    
+
     public bool execute(out int delay_value, out bool desktop_background, out bool screensaver) {
-        bool result = execute_base();
-        
+        this.show_all();
+        var result = this.run() == Gtk.ResponseType.OK;
+        this.hide ();
+
         delay_value = this.delay_value;
-        desktop_background = this.desktop;
-        screensaver = this.screensaver;
-        
+        desktop_background = desktop_background_checkbox.active;
+        screensaver = screensaver_checkbox.active;
+
+        this.destroy();
         return result;
     }
 }
 
+
 public class TextEntryDialog : Gtk.Dialog {
     public delegate bool OnModifyValidateType(string text);
     
diff --git a/src/Dimensions.c b/src/Dimensions.c
index a285197..57c20a2 100644
--- a/src/Dimensions.c
+++ b/src/Dimensions.c
@@ -1,4 +1,4 @@
-/* Dimensions.c generated by valac 0.34.2, the Vala compiler
+/* Dimensions.c generated by valac 0.32.1, 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 de6ff94..7527ed1 100644
--- a/src/DirectoryMonitor.c
+++ b/src/DirectoryMonitor.c
@@ -1,4 +1,4 @@
-/* DirectoryMonitor.c generated by valac 0.34.2, the Vala compiler
+/* DirectoryMonitor.c generated by valac 0.32.1, 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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
@@ -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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
@@ -3785,7 +3785,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 3784 "DirectoryMonitor.c"
-				goto __catch479_g_error;
+				goto __catch477_g_error;
 			}
 #line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp15_ = NULL;
@@ -3801,8 +3801,8 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 			_g_object_unref0 (_data_->_tmp11_);
 #line 3799 "DirectoryMonitor.c"
 		}
-		goto __finally479;
-		__catch479_g_error:
+		goto __finally477;
+		__catch477_g_error:
 		{
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->err = _data_->_inner_error_;
@@ -3858,7 +3858,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 			return FALSE;
 #line 3856 "DirectoryMonitor.c"
 		}
-		__finally479:
+		__finally477:
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4089,7 +4089,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 4088 "DirectoryMonitor.c"
-			goto __catch480_g_error;
+			goto __catch478_g_error;
 		}
 		{
 #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4129,7 +4129,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_g_object_unref0 (_data_->enumerator);
 #line 4128 "DirectoryMonitor.c"
-					goto __catch480_g_error;
+					goto __catch478_g_error;
 				}
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp55_ = NULL;
@@ -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_TYPE_FILE, (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);
 #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_TYPE_FILE, (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);
 #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_g_object_unref0 (_data_->dir_map);
 #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4371,8 +4371,8 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 		_g_object_unref0 (_data_->enumerator);
 #line 4369 "DirectoryMonitor.c"
 	}
-	goto __finally480;
-	__catch480_g_error:
+	goto __finally478;
+	__catch478_g_error:
 	{
 #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->err2 = _data_->_inner_error_;
@@ -4432,7 +4432,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 		return FALSE;
 #line 4430 "DirectoryMonitor.c"
 	}
-	__finally480:
+	__finally478:
 #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5058,7 +5058,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 #line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5057 "DirectoryMonitor.c"
-			goto __catch481_g_error;
+			goto __catch479_g_error;
 		}
 #line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp12_ = _tmp9_;
@@ -5072,8 +5072,8 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		_g_object_unref0 (_tmp9_);
 #line 5070 "DirectoryMonitor.c"
 	}
-	goto __finally481;
-	__catch481_g_error:
+	goto __finally479;
+	__catch479_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp13_ = NULL;
@@ -5111,7 +5111,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		return result;
 #line 5109 "DirectoryMonitor.c"
 	}
-	__finally481:
+	__finally479:
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7539,7 +7539,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp0_ = source;
 #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_file_get_type (), GFile));
+	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_FILE, GFile));
 #line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	source_file = _tmp1_;
 #line 7540 "DirectoryMonitor.c"
@@ -7557,7 +7557,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7554 "DirectoryMonitor.c"
-			goto __catch482_g_error;
+			goto __catch480_g_error;
 		}
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp5_ = _tmp2_;
@@ -7571,8 +7571,8 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		_g_object_unref0 (_tmp2_);
 #line 7567 "DirectoryMonitor.c"
 	}
-	goto __finally482;
-	__catch482_g_error:
+	goto __finally480;
+	__catch480_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -7593,7 +7593,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		_g_error_free0 (err);
 #line 7589 "DirectoryMonitor.c"
 	}
-	__finally482:
+	__finally480:
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8696,7 +8696,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 #line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8693 "DirectoryMonitor.c"
-			goto __catch483_g_error;
+			goto __catch481_g_error;
 		}
 #line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp7_ = _tmp3_;
@@ -8710,8 +8710,8 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		_g_object_unref0 (_tmp3_);
 #line 8706 "DirectoryMonitor.c"
 	}
-	goto __finally483;
-	__catch483_g_error:
+	goto __finally481;
+	__catch481_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp8_ = NULL;
@@ -8747,7 +8747,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		return result;
 #line 8743 "DirectoryMonitor.c"
 	}
-	__finally483:
+	__finally481:
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9165,7 +9165,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 #line 9160 "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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
@@ -9637,11 +9637,11 @@ 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_TYPE_FILE, (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);
 #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, g_free, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
@@ -9797,43 +9797,43 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) {
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	G_OBJECT_CLASS (klass)->finalize = directory_monitor_finalize;
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("root_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("root_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, G_TYPE_FILE, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("root_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	g_signal_new ("root_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, root_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_signal_new ("discovery_started", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_started), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("file_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("directory_discovered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_discovered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_signal_new ("discovery_failed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_failed), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_signal_new ("discovery_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, discovery_completed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("file_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("file_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, G_TYPE_FILE, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	g_signal_new ("file_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("file_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	g_signal_new ("file_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("file_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	g_signal_new ("file_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, file_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("directory_created", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_created), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, g_file_get_type (), g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("directory_moved", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_moved), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, G_TYPE_FILE, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	g_signal_new ("directory_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_info_get_type ());
+	g_signal_new ("directory_alteration_completed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_alteration_completed), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, g_file_info_get_type ());
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	g_signal_new ("directory_attributes_altered", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_attributes_altered), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_FILE);
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_new ("directory_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
+	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_TYPE_FILE);
 #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"
diff --git a/src/Event.c b/src/Event.c
index b83831b..60e96ca 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -1,4 +1,4 @@
-/* Event.c generated by valac 0.34.2, the Vala compiler
+/* Event.c generated by valac 0.32.1, the Vala compiler
  * generated from Event.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3752,7 +3752,7 @@ Event* event_create_empty_event (MediaSource* source) {
 #line 476 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3755 "Event.c"
-				goto __catch434_database_error;
+				goto __catch432_database_error;
 			}
 #line 476 "/home/jens/Source/shotwell/src/Event.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3790,8 +3790,8 @@ Event* event_create_empty_event (MediaSource* source) {
 		return result;
 #line 3792 "Event.c"
 	}
-	goto __finally434;
-	__catch434_database_error:
+	goto __finally432;
+	__catch432_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp14_ = NULL;
@@ -3811,7 +3811,7 @@ Event* event_create_empty_event (MediaSource* source) {
 		return result;
 #line 3813 "Event.c"
 	}
-	__finally434:
+	__finally432:
 #line 475 "/home/jens/Source/shotwell/src/Event.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 475 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4020,11 +4020,11 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 #line 526 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4023 "Event.c"
-			goto __catch435_g_error;
+			goto __catch433_g_error;
 		}
 	}
-	goto __finally435;
-	__catch435_g_error:
+	goto __finally433;
+	__catch433_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -4051,7 +4051,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		_g_error_free0 (err);
 #line 4053 "Event.c"
 	}
-	__finally435:
+	__finally433:
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4081,11 +4081,11 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 #line 532 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4084 "Event.c"
-			goto __catch436_g_error;
+			goto __catch434_g_error;
 		}
 	}
-	goto __finally436;
-	__catch436_g_error:
+	goto __finally434;
+	__catch434_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_ = NULL;
@@ -4112,7 +4112,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		_g_error_free0 (err);
 #line 4114 "Event.c"
 	}
-	__finally436:
+	__finally434:
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4198,11 +4198,11 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 #line 556 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4201 "Event.c"
-			goto __catch437_g_error;
+			goto __catch435_g_error;
 		}
 	}
-	goto __finally437;
-	__catch437_g_error:
+	goto __finally435;
+	__catch435_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -4229,7 +4229,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		_g_error_free0 (err);
 #line 4231 "Event.c"
 	}
-	__finally437:
+	__finally435:
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4259,11 +4259,11 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 #line 562 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4262 "Event.c"
-			goto __catch438_g_error;
+			goto __catch436_g_error;
 		}
 	}
-	goto __finally438;
-	__catch438_g_error:
+	goto __finally436;
+	__catch436_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_ = NULL;
@@ -4290,7 +4290,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		_g_error_free0 (err);
 #line 4292 "Event.c"
 	}
-	__finally438:
+	__finally436:
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4322,72 +4322,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	gboolean _tmp2_ = FALSE;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		separator = "";
 #line 4332 "Event.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 4342 "Event.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 4352 "Event.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 4358 "Event.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 4369 "Event.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 4381 "Event.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 4385 "Event.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 4389 "Event.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 4393 "Event.c"
 		gint i = 0;
@@ -4410,16 +4410,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp44_ = NULL;
 		void* _tmp45_ = NULL;
 		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 4416 "Event.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 4425 "Event.c"
 				gboolean _tmp11_ = FALSE;
@@ -4432,97 +4432,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gint _tmp23_ = 0;
 				const gchar* _tmp24_ = NULL;
 				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 4438 "Event.c"
 					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 4444 "Event.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 4454 "Event.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 4466 "Event.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 4470 "Event.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 4476 "Event.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 4487 "Event.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
 						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 4502 "Event.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 4506 "Event.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 4510 "Event.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					break;
 #line 4516 "Event.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 4528 "Event.c"
 					gchar** _tmp25_ = NULL;
@@ -4531,91 +4531,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					const gchar* _tmp27_ = NULL;
 					gint _tmp28_ = 0;
 					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 4549 "Event.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 4553 "Event.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 4559 "Event.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 4566 "Event.c"
 			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return result;
 #line 4574 "Event.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 4612 "Event.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 4621 "Event.c"
 				gint _tmp48_ = 0;
@@ -4631,94 +4631,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				const gchar* _tmp56_ = NULL;
 				void* _tmp60_ = NULL;
 				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 4637 "Event.c"
 					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 4643 "Event.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					break;
 #line 4657 "Event.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 4677 "Event.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
 					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 4692 "Event.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 4696 "Event.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 4704 "Event.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 4715 "Event.c"
 	} else {
 		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 4724 "Event.c"
 	}
@@ -4898,13 +4898,13 @@ static const gchar* event_real_get_indexable_keywords (Indexable* base) {
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return;
 #line 4910 "Event.c"
 }
@@ -5324,7 +5324,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 #line 658 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5326 "Event.c"
-				goto __catch439_database_error;
+				goto __catch437_database_error;
 			}
 #line 658 "/home/jens/Source/shotwell/src/Event.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5381,8 +5381,8 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		return result;
 #line 5382 "Event.c"
 	}
-	goto __finally439;
-	__catch439_database_error:
+	goto __finally437;
+	__catch437_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp49_ = NULL;
@@ -5398,7 +5398,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		_g_error_free0 (err);
 #line 5399 "Event.c"
 	}
-	__finally439:
+	__finally437:
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6904,7 +6904,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 #line 903 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6906 "Event.c"
-			goto __catch440_g_error;
+			goto __catch438_g_error;
 		}
 #line 903 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp6_ = _tmp0_;
@@ -6918,8 +6918,8 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 		return result;
 #line 6919 "Event.c"
 	}
-	goto __finally440;
-	__catch440_g_error:
+	goto __finally438;
+	__catch438_g_error:
 	{
 		GError* err = NULL;
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6934,7 +6934,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 		return result;
 #line 6935 "Event.c"
 	}
-	__finally440:
+	__finally438:
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6976,7 +6976,7 @@ static void event_real_destroy (DataSource* base) {
 #line 915 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6978 "Event.c"
-				goto __catch441_database_error;
+				goto __catch439_database_error;
 			}
 #line 915 "/home/jens/Source/shotwell/src/Event.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6987,8 +6987,8 @@ static void event_real_destroy (DataSource* base) {
 #line 6987 "Event.c"
 		}
 	}
-	goto __finally441;
-	__catch441_database_error:
+	goto __finally439;
+	__catch439_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7004,7 +7004,7 @@ static void event_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 7005 "Event.c"
 	}
-	__finally441:
+	__finally439:
 #line 914 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 914 "/home/jens/Source/shotwell/src/Event.vala"
diff --git a/src/Exporter.c b/src/Exporter.c
index bba2455..999c598 100644
--- a/src/Exporter.c
+++ b/src/Exporter.c
@@ -1,4 +1,4 @@
-/* Exporter.c generated by valac 0.34.2, the Vala compiler
+/* Exporter.c generated by valac 0.32.1, the Vala compiler
  * generated from Exporter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1480,7 +1480,7 @@ static gboolean exporter_process_queue (Exporter* self) {
 #line 230 "/home/jens/Source/shotwell/src/Exporter.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1483 "Exporter.c"
-						goto __catch477_g_error;
+						goto __catch475_g_error;
 					}
 #line 230 "/home/jens/Source/shotwell/src/Exporter.vala"
 					_tmp43_ = _tmp36_;
@@ -1494,8 +1494,8 @@ static gboolean exporter_process_queue (Exporter* self) {
 					_g_object_unref0 (_tmp36_);
 #line 1496 "Exporter.c"
 				}
-				goto __finally477;
-				__catch477_g_error:
+				goto __finally475;
+				__catch475_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp44_ = NULL;
@@ -1556,7 +1556,7 @@ static gboolean exporter_process_queue (Exporter* self) {
 					break;
 #line 1558 "Exporter.c"
 				}
-				__finally477:
+				__finally475:
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2054,7 +2054,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 #line 97 "/home/jens/Source/shotwell/src/Exporter.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2057 "Exporter.c"
-				goto __catch478_g_error;
+				goto __catch476_g_error;
 			}
 		} else {
 			MediaSource* _tmp9_ = NULL;
@@ -2074,13 +2074,13 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 #line 99 "/home/jens/Source/shotwell/src/Exporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2077 "Exporter.c"
-					goto __catch478_g_error;
+					goto __catch476_g_error;
 				}
 			}
 		}
 	}
-	goto __finally478;
-	__catch478_g_error:
+	goto __finally476;
+	__catch476_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp12_ = NULL;
@@ -2101,7 +2101,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2103 "Exporter.c"
 	}
-	__finally478:
+	__finally476:
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
diff --git a/src/International.c b/src/International.c
index bc86722..db54c27 100644
--- a/src/International.c
+++ b/src/International.c
@@ -1,4 +1,4 @@
-/* International.c generated by valac 0.34.2, the Vala compiler
+/* International.c generated by valac 0.32.1, 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 a9602ad..3a088bf 100644
--- a/src/LibraryFiles.c
+++ b/src/LibraryFiles.c
@@ -1,4 +1,4 @@
-/* LibraryFiles.c generated by valac 0.34.2, the Vala compiler
+/* LibraryFiles.c generated by valac 0.32.1, the Vala compiler
  * generated from LibraryFiles.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -282,11 +282,11 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 #line 30 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 285 "LibraryFiles.c"
-			goto __catch461_g_error;
+			goto __catch459_g_error;
 		}
 	}
-	goto __finally461;
-	__catch461_g_error:
+	goto __finally459;
+	__catch459_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp12_ = NULL;
@@ -310,13 +310,13 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 #line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_error_free0 (err);
 #line 313 "LibraryFiles.c"
-			goto __finally461;
+			goto __finally459;
 		}
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
 #line 318 "LibraryFiles.c"
 	}
-	__finally461:
+	__finally459:
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -441,14 +441,14 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 444 "LibraryFiles.c"
-			goto __catch462_g_error;
+			goto __catch460_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		timestamp = _tmp0_;
 #line 449 "LibraryFiles.c"
 	}
-	goto __finally462;
-	__catch462_g_error:
+	goto __finally460;
+	__catch460_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp3_ = NULL;
@@ -478,7 +478,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		_g_error_free0 (err);
 #line 480 "LibraryFiles.c"
 	}
-	__finally462:
+	__finally460:
 #line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -520,7 +520,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 523 "LibraryFiles.c"
-				goto __catch463_g_error;
+				goto __catch461_g_error;
 			}
 #line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp15_ = _tmp12_;
@@ -534,8 +534,8 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 			_media_metadata_unref0 (_tmp12_);
 #line 536 "LibraryFiles.c"
 		}
-		goto __finally463;
-		__catch463_g_error:
+		goto __finally461;
+		__catch461_g_error:
 		{
 			GError* err = NULL;
 #line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -546,7 +546,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 			_g_error_free0 (err);
 #line 548 "LibraryFiles.c"
 		}
-		__finally463:
+		__finally461:
 #line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -604,7 +604,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 607 "LibraryFiles.c"
-				goto __catch464_g_error;
+				goto __catch462_g_error;
 			}
 #line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp26_ = _tmp23_;
@@ -618,8 +618,8 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 			_media_metadata_unref0 (_tmp23_);
 #line 620 "LibraryFiles.c"
 		}
-		goto __finally464;
-		__catch464_g_error:
+		goto __finally462;
+		__catch462_g_error:
 		{
 			GError* err = NULL;
 #line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -630,7 +630,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 			_g_error_free0 (err);
 #line 632 "LibraryFiles.c"
 		}
-		__finally464:
+		__finally462:
 #line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -728,7 +728,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 731 "LibraryFiles.c"
-			goto __catch465_g_error;
+			goto __catch463_g_error;
 		}
 #line 83 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp42_ = blacklist;
@@ -743,8 +743,8 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 744 "LibraryFiles.c"
 		}
 	}
-	goto __finally465;
-	__catch465_g_error:
+	goto __finally463;
+	__catch463_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp44_ = NULL;
@@ -798,7 +798,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_error_free0 (err);
 #line 801 "LibraryFiles.c"
-				goto __finally465;
+				goto __finally463;
 			}
 #line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp55_ = dest;
@@ -813,7 +813,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_error_free0 (err);
 #line 816 "LibraryFiles.c"
-				goto __finally465;
+				goto __finally463;
 			}
 #line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp57_ = _tmp51_;
@@ -857,7 +857,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		_g_error_free0 (err);
 #line 859 "LibraryFiles.c"
 	}
-	__finally465:
+	__finally463:
 #line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -890,7 +890,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 893 "LibraryFiles.c"
-			goto __catch466_g_error;
+			goto __catch464_g_error;
 		}
 #line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp64_ = info;
@@ -911,7 +911,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_object_unref0 (info);
 #line 914 "LibraryFiles.c"
-			goto __catch466_g_error;
+			goto __catch464_g_error;
 		}
 #line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (!_tmp66_) {
@@ -923,8 +923,8 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		_g_object_unref0 (info);
 #line 925 "LibraryFiles.c"
 	}
-	goto __finally466;
-	__catch466_g_error:
+	goto __finally464;
+	__catch464_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp70_ = NULL;
@@ -943,7 +943,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		_g_error_free0 (err);
 #line 945 "LibraryFiles.c"
 	}
-	__finally466:
+	__finally464:
 #line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c
index b3b33d6..761ddd2 100644
--- a/src/LibraryMonitor.c
+++ b/src/LibraryMonitor.c
@@ -1,4 +1,4 @@
-/* LibraryMonitor.c generated by valac 0.34.2, the Vala compiler
+/* LibraryMonitor.c generated by valac 0.32.1, the Vala compiler
  * generated from LibraryMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2251,7 +2251,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 #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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
@@ -2624,7 +2624,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 #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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
@@ -4123,7 +4123,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 4126 "LibraryMonitor.c"
-							goto __catch484_g_error;
+							goto __catch482_g_error;
 						}
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp31_ = NULL;
@@ -4139,8 +4139,8 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						_g_object_unref0 (_data_->_tmp27_);
 #line 4141 "LibraryMonitor.c"
 					}
-					goto __finally484;
-					__catch484_g_error:
+					goto __finally482;
+					__catch482_g_error:
 					{
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->err = _data_->_inner_error_;
@@ -4150,7 +4150,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						_g_error_free0 (_data_->err);
 #line 4152 "LibraryMonitor.c"
 					}
-					__finally484:
+					__finally482:
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5384,7 +5384,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5387 "LibraryMonitor.c"
-					goto __catch485_database_error;
+					goto __catch483_database_error;
 				}
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (to_tombstone);
@@ -5397,8 +5397,8 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 #line 5398 "LibraryMonitor.c"
 			}
 		}
-		goto __finally485;
-		__catch485_database_error:
+		goto __finally483;
+		__catch483_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp58_ = NULL;
@@ -5414,7 +5414,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			_g_error_free0 (err);
 #line 5416 "LibraryMonitor.c"
 		}
-		__finally485:
+		__finally483:
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5502,7 +5502,7 @@ void library_monitor_blacklist_file (GFile* file, const gchar* reason) {
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
 #line 5504 "LibraryMonitor.c"
 		}
-		__finally486:
+		__finally484:
 		{
 			GeeHashSet* _tmp9_ = NULL;
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5582,7 +5582,7 @@ void library_monitor_unblacklist_file (GFile* file) {
 #line 5583 "LibraryMonitor.c"
 			}
 		}
-		__finally487:
+		__finally485:
 		{
 			GeeHashSet* _tmp10_ = NULL;
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5632,7 +5632,7 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
 			removed = _tmp3_;
 #line 5634 "LibraryMonitor.c"
 		}
-		__finally488:
+		__finally486:
 		{
 			GeeHashSet* _tmp4_ = NULL;
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5734,7 +5734,7 @@ gboolean library_monitor_is_blacklisted (GFile* file) {
 			return result;
 #line 5736 "LibraryMonitor.c"
 		}
-		__finally489:
+		__finally487:
 		{
 			GeeHashSet* _tmp5_ = NULL;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6053,7 +6053,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 #line 6054 "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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
@@ -7858,7 +7858,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7860 "LibraryMonitor.c"
-			goto __catch490_g_error;
+			goto __catch488_g_error;
 		}
 #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp18_ = _tmp15_;
@@ -7872,8 +7872,8 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		_g_free0 (_tmp15_);
 #line 7873 "LibraryMonitor.c"
 	}
-	goto __finally490;
-	__catch490_g_error:
+	goto __finally488;
+	__catch488_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_ = NULL;
@@ -7900,7 +7900,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		return;
 #line 7901 "LibraryMonitor.c"
 	}
-	__finally490:
+	__finally488:
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8212,7 +8212,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8213 "LibraryMonitor.c"
-			goto __catch491_g_error;
+			goto __catch489_g_error;
 		}
 #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp3_ = _tmp0_;
@@ -8226,8 +8226,8 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		_g_free0 (_tmp0_);
 #line 8226 "LibraryMonitor.c"
 	}
-	goto __finally491;
-	__catch491_g_error:
+	goto __finally489;
+	__catch489_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -8252,7 +8252,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		return;
 #line 8252 "LibraryMonitor.c"
 	}
-	__finally491:
+	__finally489:
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8727,11 +8727,11 @@ 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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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_TYPE_FILE, (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);
 #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_to_unblacklist = _tmp1_;
 #line 8736 "LibraryMonitor.c"
@@ -8770,11 +8770,11 @@ static void library_monitor_instance_init (LibraryMonitor * self) {
 #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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c
index 66be0bd..5e80e43 100644
--- a/src/MediaDataRepresentation.c
+++ b/src/MediaDataRepresentation.c
@@ -1,4 +1,4 @@
-/* MediaDataRepresentation.c generated by valac 0.34.2, the Vala compiler
+/* MediaDataRepresentation.c generated by valac 0.32.1, the Vala compiler
  * generated from MediaDataRepresentation.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2081,14 +2081,14 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2084 "MediaDataRepresentation.c"
-			goto __catch559_g_error;
+			goto __catch557_g_error;
 		}
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		ret = _tmp1_;
 #line 2089 "MediaDataRepresentation.c"
 	}
-	goto __finally559;
-	__catch559_g_error:
+	goto __finally557;
+	__catch557_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp4_ = NULL;
@@ -2119,7 +2119,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 		_g_error_free0 (err);
 #line 2120 "MediaDataRepresentation.c"
 	}
-	__finally559:
+	__finally557:
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2239,7 +2239,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2241 "MediaDataRepresentation.c"
-					goto __catch560_g_error;
+					goto __catch558_g_error;
 				}
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (!_tmp29_) {
@@ -2248,8 +2248,8 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 2248 "MediaDataRepresentation.c"
 				}
 			}
-			goto __finally560;
-			__catch560_g_error:
+			goto __finally558;
+			__catch558_g_error:
 			{
 				GError* err = NULL;
 				GFile* _tmp32_ = NULL;
@@ -2281,7 +2281,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				break;
 #line 2282 "MediaDataRepresentation.c"
 			}
-			__finally560:
+			__finally558:
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2308,7 +2308,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2310 "MediaDataRepresentation.c"
-					goto __catch561_g_error;
+					goto __catch559_g_error;
 				}
 #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp38_ = parent;
@@ -2322,8 +2322,8 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				_g_free0 (_tmp40_);
 #line 2323 "MediaDataRepresentation.c"
 			}
-			goto __finally561;
-			__catch561_g_error:
+			goto __finally559;
+			__catch559_g_error:
 			{
 				GError* err = NULL;
 				GFile* _tmp41_ = NULL;
@@ -2354,7 +2354,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				_g_error_free0 (err);
 #line 2354 "MediaDataRepresentation.c"
 			}
-			__finally561:
+			__finally559:
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3481,7 +3481,7 @@ static void media_source_class_init (MediaSourceClass * klass) {
 #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 ());
+	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_TYPE_FILE, G_TYPE_FILE);
 #line 3484 "MediaDataRepresentation.c"
 }
 
@@ -3970,7 +3970,7 @@ 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_TYPE_FILE, (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);
 #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->master_file_map = _tmp0_;
 #line 3975 "MediaDataRepresentation.c"
@@ -6399,7 +6399,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6400 "MediaDataRepresentation.c"
-					goto __catch562_database_error;
+					goto __catch560_database_error;
 				}
 #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_aggregate_progress_monitor_unref0 (agg_monitor);
@@ -6422,8 +6422,8 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 #line 6421 "MediaDataRepresentation.c"
 			}
 		}
-		goto __finally562;
-		__catch562_database_error:
+		goto __finally560;
+		__catch560_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp78_ = NULL;
@@ -6439,7 +6439,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 			_g_error_free0 (err);
 #line 6439 "MediaDataRepresentation.c"
 		}
-		__finally562:
+		__finally560:
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6564,11 +6564,11 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6565 "MediaDataRepresentation.c"
-					goto __catch563_g_error;
+					goto __catch561_g_error;
 				}
 			}
-			goto __finally563;
-			__catch563_g_error:
+			goto __finally561;
+			__catch561_g_error:
 			{
 				GError* err = NULL;
 				GFile* _tmp12_ = NULL;
@@ -6598,7 +6598,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 				_g_error_free0 (err);
 #line 6598 "MediaDataRepresentation.c"
 			}
-			__finally563:
+			__finally561:
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6839,7 +6839,7 @@ static void media_source_collection_class_init (MediaSourceCollectionClass * kla
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_new ("media_import_completed", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_completed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_signal_new ("master_file_replaced", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, master_file_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, g_file_get_type (), g_file_get_type ());
+	g_signal_new ("master_file_replaced", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, master_file_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, G_TYPE_FILE, G_TYPE_FILE);
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_new ("trashcan_contents_altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, trashcan_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION);
 #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6864,7 +6864,7 @@ 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_TYPE_FILE, (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);
 #line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->by_master_file = _tmp0_;
 #line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c
index 019cddc..ba3f229 100644
--- a/src/MediaInterfaces.c
+++ b/src/MediaInterfaces.c
@@ -1,4 +1,4 @@
-/* MediaInterfaces.c generated by valac 0.34.2, the Vala compiler
+/* MediaInterfaces.c generated by valac 0.32.1, the Vala compiler
  * generated from MediaInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -293,11 +293,11 @@ void transaction_controller_begin (TransactionController* self) {
 #line 69 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 296 "MediaInterfaces.c"
-					goto __catch570_g_error;
+					goto __catch568_g_error;
 				}
 			}
-			goto __finally570;
-			__catch570_g_error:
+			goto __finally568;
+			__catch568_g_error:
 			{
 				GError* err = NULL;
 				gint _tmp3_ = 0;
@@ -344,7 +344,7 @@ void transaction_controller_begin (TransactionController* self) {
 				_g_error_free0 (err);
 #line 346 "MediaInterfaces.c"
 			}
-			__finally570:
+			__finally568:
 #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 351 "MediaInterfaces.c"
@@ -365,7 +365,7 @@ void transaction_controller_begin (TransactionController* self) {
 #line 366 "MediaInterfaces.c"
 			}
 		}
-		__finally569:
+		__finally567:
 		{
 			gint _tmp11_ = 0;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -453,11 +453,11 @@ void transaction_controller_commit (TransactionController* self) {
 #line 93 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 456 "MediaInterfaces.c"
-					goto __catch572_g_error;
+					goto __catch570_g_error;
 				}
 			}
-			goto __finally572;
-			__catch572_g_error:
+			goto __finally570;
+			__catch570_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp5_ = NULL;
@@ -499,7 +499,7 @@ void transaction_controller_commit (TransactionController* self) {
 				_g_error_free0 (err);
 #line 501 "MediaInterfaces.c"
 			}
-			__finally572:
+			__finally570:
 #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 506 "MediaInterfaces.c"
@@ -520,7 +520,7 @@ void transaction_controller_commit (TransactionController* self) {
 #line 521 "MediaInterfaces.c"
 			}
 		}
-		__finally571:
+		__finally569:
 		{
 			gint _tmp12_ = 0;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -792,7 +792,7 @@ static void transaction_controller_finalize (TransactionController* obj) {
 			_vala_assert (_tmp1_ == 0, "count == 0");
 #line 794 "MediaInterfaces.c"
 		}
-		__finally568:
+		__finally566:
 		{
 			gint _tmp2_ = 0;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
diff --git a/src/MediaMetadata.c b/src/MediaMetadata.c
index dd49c19..b426c62 100644
--- a/src/MediaMetadata.c
+++ b/src/MediaMetadata.c
@@ -1,4 +1,4 @@
-/* MediaMetadata.c generated by valac 0.34.2, the Vala compiler
+/* MediaMetadata.c generated by valac 0.32.1, the Vala compiler
  * generated from MediaMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1093,13 +1093,13 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t*
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return;
 #line 1105 "MediaMetadata.c"
 }
@@ -1117,35 +1117,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 1151 "MediaMetadata.c"
 }
diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c
index 2cf2d28..aa1cd67 100644
--- a/src/MediaMonitor.c
+++ b/src/MediaMonitor.c
@@ -1,4 +1,4 @@
-/* MediaMonitor.c generated by valac 0.34.2, the Vala compiler
+/* MediaMonitor.c generated by valac 0.32.1, the Vala compiler
  * generated from MediaMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2166,7 +2166,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 #line 2167 "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, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
@@ -2853,7 +2853,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2856 "MediaMonitor.c"
-				goto __catch581_g_error;
+				goto __catch579_g_error;
 			}
 #line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp39_ = controller;
@@ -2861,8 +2861,8 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			transaction_controller_commit (_tmp39_);
 #line 2863 "MediaMonitor.c"
 		}
-		goto __finally581;
-		__catch581_g_error:
+		goto __finally579;
+		__catch579_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp40_ = NULL;
@@ -2907,7 +2907,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			_g_error_free0 (err);
 #line 2909 "MediaMonitor.c"
 		}
-		__finally581:
+		__finally579:
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
diff --git a/src/MediaPage.c b/src/MediaPage.c
index ef9658a..3cd4e03 100644
--- a/src/MediaPage.c
+++ b/src/MediaPage.c
@@ -1,4 +1,4 @@
-/* MediaPage.c generated by valac 0.34.2, the Vala compiler
+/* MediaPage.c generated by valac 0.32.1, the Vala compiler
  * generated from MediaPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1174,14 +1174,14 @@ void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, g
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
 GAction* page_get_action (Page* self, const gchar* name);
-static GVariant* _variant_new19 (gboolean value);
-static GVariant* _variant_new20 (gboolean value);
-static GVariant* _variant_new21 (gboolean value);
-static GVariant* _variant_new22 (gboolean value);
-static GVariant* _variant_new23 (gchar* value);
-static GVariant* _variant_new24 (const gchar* value);
+static GVariant* _variant_new23 (gboolean value);
+static GVariant* _variant_new24 (gboolean value);
+static GVariant* _variant_new25 (gboolean value);
+static GVariant* _variant_new26 (gboolean value);
+static GVariant* _variant_new27 (gchar* value);
+static GVariant* _variant_new28 (const gchar* value);
 RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
-static GVariant* _variant_new25 (const gchar* value);
+static GVariant* _variant_new29 (const gchar* value);
 static void media_page_real_update_actions (Page* base, gint selected_count, gint count);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 gboolean desktop_integration_is_send_to_installed (void);
@@ -1395,9 +1395,9 @@ static void media_page_real_set_display_comments (CheckerboardPage* base, gboole
 static GAction* media_page_sort_by_title_action (MediaPage* self);
 static GAction* media_page_sort_ascending_action (MediaPage* self);
 void media_page_set_menu_sort_by (MediaPage* self, gint val);
-static GVariant* _variant_new26 (const gchar* value);
+static GVariant* _variant_new30 (const gchar* value);
 void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending);
-static GVariant* _variant_new27 (const gchar* value);
+static GVariant* _variant_new31 (const gchar* value);
 gint64 thumbnail_title_ascending_comparator (void* a, void* b);
 static gint64 _thumbnail_title_ascending_comparator_comparator (void* a, void* b, gpointer self);
 gint64 thumbnail_title_descending_comparator (void* a, void* b);
@@ -2618,49 +2618,49 @@ static void media_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f
 }
 
 
-static GVariant* _variant_new19 (gboolean value) {
+static GVariant* _variant_new23 (gboolean value) {
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 2625 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new20 (gboolean value) {
+static GVariant* _variant_new24 (gboolean value) {
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 2632 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new21 (gboolean value) {
+static GVariant* _variant_new25 (gboolean value) {
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 2639 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new22 (gboolean value) {
+static GVariant* _variant_new26 (gboolean value) {
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 2646 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new23 (gchar* value) {
+static GVariant* _variant_new27 (gchar* value) {
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
 #line 2653 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new24 (const gchar* value) {
+static GVariant* _variant_new28 (const gchar* value) {
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
 #line 2660 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new25 (const gchar* value) {
+static GVariant* _variant_new29 (const gchar* value) {
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
 #line 2667 "MediaPage.c"
@@ -2676,58 +2676,50 @@ static void media_page_real_add_actions (Page* base) {
 	AppWindow* _tmp2_ = NULL;
 	AppWindow* _tmp3_ = NULL;
 	GAction* _tmp4_ = NULL;
-	GSimpleAction* _tmp5_ = NULL;
-	GSimpleAction* _tmp6_ = NULL;
+	GAction* _tmp5_ = NULL;
+	ConfigFacade* _tmp6_ = NULL;
 	ConfigFacade* _tmp7_ = NULL;
-	ConfigFacade* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-	GVariant* _tmp10_ = NULL;
+	gboolean _tmp8_ = FALSE;
+	GVariant* _tmp9_ = NULL;
+	GAction* _tmp10_ = NULL;
 	GAction* _tmp11_ = NULL;
-	GSimpleAction* _tmp12_ = NULL;
-	GSimpleAction* _tmp13_ = NULL;
-	ConfigFacade* _tmp14_ = NULL;
-	ConfigFacade* _tmp15_ = NULL;
-	gboolean _tmp16_ = FALSE;
-	GVariant* _tmp17_ = NULL;
-	GAction* _tmp18_ = NULL;
-	GSimpleAction* _tmp19_ = NULL;
-	GSimpleAction* _tmp20_ = NULL;
-	ConfigFacade* _tmp21_ = NULL;
-	ConfigFacade* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
-	GVariant* _tmp24_ = NULL;
-	GAction* _tmp25_ = NULL;
-	GSimpleAction* _tmp26_ = NULL;
-	GSimpleAction* _tmp27_ = NULL;
-	ConfigFacade* _tmp28_ = NULL;
-	ConfigFacade* _tmp29_ = NULL;
-	gboolean _tmp30_ = FALSE;
-	GVariant* _tmp31_ = NULL;
-	GAction* _tmp32_ = NULL;
-	GSimpleAction* _tmp33_ = NULL;
-	GSimpleAction* _tmp34_ = NULL;
-	gint _tmp35_ = 0;
-	gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
+	ConfigFacade* _tmp12_ = NULL;
+	ConfigFacade* _tmp13_ = NULL;
+	gboolean _tmp14_ = FALSE;
+	GVariant* _tmp15_ = NULL;
+	GAction* _tmp16_ = NULL;
+	GAction* _tmp17_ = NULL;
+	ConfigFacade* _tmp18_ = NULL;
+	ConfigFacade* _tmp19_ = NULL;
+	gboolean _tmp20_ = FALSE;
+	GVariant* _tmp21_ = NULL;
+	GAction* _tmp22_ = NULL;
+	GAction* _tmp23_ = NULL;
+	ConfigFacade* _tmp24_ = NULL;
+	ConfigFacade* _tmp25_ = NULL;
+	gboolean _tmp26_ = FALSE;
+	GVariant* _tmp27_ = NULL;
+	GAction* _tmp28_ = NULL;
+	GAction* _tmp29_ = NULL;
+	gint _tmp30_ = 0;
+	gchar* _tmp31_ = NULL;
+	gchar* _tmp32_ = NULL;
+	GVariant* _tmp33_ = NULL;
+	const gchar* _tmp34_ = NULL;
+	gboolean _tmp35_ = FALSE;
+	GAction* _tmp36_ = NULL;
+	GAction* _tmp37_ = NULL;
 	GVariant* _tmp38_ = NULL;
-	const gchar* _tmp39_ = NULL;
-	gboolean _tmp40_ = FALSE;
-	GAction* _tmp41_ = NULL;
-	GSimpleAction* _tmp42_ = NULL;
-	GSimpleAction* _tmp43_ = NULL;
-	GVariant* _tmp44_ = NULL;
 	RawDeveloper d = 0;
-	ConfigFacade* _tmp45_ = NULL;
-	ConfigFacade* _tmp46_ = NULL;
-	RawDeveloper _tmp47_ = 0;
-	RawDeveloper _tmp48_ = 0;
-	GSimpleAction* action = NULL;
-	GAction* _tmp49_ = NULL;
-	GSimpleAction* _tmp50_ = NULL;
-	const gchar* _tmp51_ = NULL;
-	RawDeveloper _tmp52_ = 0;
-	GSimpleAction* _tmp53_ = NULL;
-	GVariant* _tmp54_ = NULL;
+	ConfigFacade* _tmp39_ = NULL;
+	ConfigFacade* _tmp40_ = NULL;
+	RawDeveloper _tmp41_ = 0;
+	RawDeveloper _tmp42_ = 0;
+	const gchar* _tmp43_ = NULL;
+	RawDeveloper _tmp44_ = 0;
+	GAction* _tmp45_ = NULL;
+	GAction* _tmp46_ = NULL;
+	GVariant* _tmp47_ = NULL;
 #line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
 #line 325 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2749,222 +2741,164 @@ static void media_page_real_add_actions (Page* base) {
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle");
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp4_) : NULL;
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp5_ == NULL) {
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp4_);
-#line 2758 "MediaPage.c"
-	}
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = config_facade_get_instance ();
+	_tmp6_ = config_facade_get_instance ();
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp8_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = _variant_new19 (_tmp9_);
+	_tmp9_ = _variant_new23 (_tmp8_);
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp6_, _tmp10_);
+	g_action_change_state (_tmp5_, _tmp9_);
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp10_);
+	_g_variant_unref0 (_tmp9_);
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp7_);
 #line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp6_);
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment");
+	_g_object_unref0 (_tmp5_);
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp11_) : NULL;
+	_tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment");
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp12_ == NULL) {
+	_tmp11_ = _tmp10_;
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp11_);
-#line 2786 "MediaPage.c"
-	}
+	_tmp12_ = config_facade_get_instance ();
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = _tmp12_;
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_ = config_facade_get_instance ();
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15_ = _tmp14_;
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp16_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp14_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_ = _variant_new20 (_tmp16_);
+	_tmp15_ = _variant_new24 (_tmp14_);
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp13_, _tmp17_);
+	g_action_change_state (_tmp11_, _tmp15_);
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp17_);
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp15_);
+	_g_variant_unref0 (_tmp15_);
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp13_);
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp11_);
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp19_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp18_) : NULL;
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp19_ == NULL) {
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp18_);
-#line 2814 "MediaPage.c"
-	}
+	_tmp16_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_ = _tmp19_;
+	_tmp17_ = _tmp16_;
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21_ = config_facade_get_instance ();
+	_tmp18_ = config_facade_get_instance ();
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp22_ = _tmp21_;
+	_tmp19_ = _tmp18_;
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp20_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24_ = _variant_new21 (_tmp23_);
+	_tmp21_ = _variant_new25 (_tmp20_);
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp20_, _tmp24_);
+	g_action_change_state (_tmp17_, _tmp21_);
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp24_);
+	_g_variant_unref0 (_tmp21_);
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp22_);
+	_g_object_unref0 (_tmp19_);
 #line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp20_);
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp25_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags");
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp25_) : NULL;
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp26_ == NULL) {
+	_g_object_unref0 (_tmp17_);
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp25_);
-#line 2842 "MediaPage.c"
-	}
+	_tmp22_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags");
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27_ = _tmp26_;
+	_tmp23_ = _tmp22_;
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp28_ = config_facade_get_instance ();
+	_tmp24_ = config_facade_get_instance ();
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp29_ = _tmp28_;
+	_tmp25_ = _tmp24_;
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp26_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp31_ = _variant_new22 (_tmp30_);
+	_tmp27_ = _variant_new26 (_tmp26_);
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp27_, _tmp31_);
+	g_action_change_state (_tmp23_, _tmp27_);
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp31_);
+	_g_variant_unref0 (_tmp27_);
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp29_);
+	_g_object_unref0 (_tmp25_);
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp27_);
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortBy");
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp33_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp32_) : NULL;
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp33_ == NULL) {
+	_g_object_unref0 (_tmp23_);
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp32_);
-#line 2870 "MediaPage.c"
-	}
+	_tmp28_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortBy");
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp34_ = _tmp33_;
+	_tmp29_ = _tmp28_;
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp35_ = sort_by;
+	_tmp30_ = sort_by;
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp36_ = g_strdup_printf ("%d", _tmp35_);
+	_tmp31_ = g_strdup_printf ("%d", _tmp30_);
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp37_ = _tmp36_;
+	_tmp32_ = _tmp31_;
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp38_ = _variant_new23 (_tmp37_);
+	_tmp33_ = _variant_new27 (_tmp32_);
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp34_, _tmp38_);
+	g_action_change_state (_tmp29_, _tmp33_);
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp38_);
+	_g_variant_unref0 (_tmp33_);
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_free0 (_tmp37_);
+	_g_free0 (_tmp32_);
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp34_);
+	_g_object_unref0 (_tmp29_);
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp40_ = sort_order;
+	_tmp35_ = sort_order;
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp40_) {
+	if (_tmp35_) {
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp39_ = "'ascending'";
-#line 2896 "MediaPage.c"
+		_tmp34_ = "ascending";
+#line 2848 "MediaPage.c"
 	} else {
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp39_ = "'descending'";
-#line 2900 "MediaPage.c"
+		_tmp34_ = "descending";
+#line 2852 "MediaPage.c"
 	}
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp41_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort");
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp42_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp41_) : NULL;
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp42_ == NULL) {
+	_tmp36_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort");
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp41_);
-#line 2910 "MediaPage.c"
-	}
-#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp43_ = _tmp42_;
+	_tmp37_ = _tmp36_;
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp44_ = _variant_new24 (_tmp39_);
+	_tmp38_ = _variant_new28 (_tmp34_);
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp43_, _tmp44_);
+	g_action_change_state (_tmp37_, _tmp38_);
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp44_);
+	_g_variant_unref0 (_tmp38_);
 #line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp43_);
-#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp45_ = config_facade_get_instance ();
-#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp46_ = _tmp45_;
-#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp47_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp48_ = _tmp47_;
-#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp46_);
-#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	d = _tmp48_;
+	_g_object_unref0 (_tmp37_);
 #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp49_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
+	_tmp39_ = config_facade_get_instance ();
 #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp50_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp49_) : NULL;
+	_tmp40_ = _tmp39_;
 #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp50_ == NULL) {
+	_tmp41_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp49_);
-#line 2942 "MediaPage.c"
-	}
+	_tmp42_ = _tmp41_;
 #line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	action = _tmp50_;
+	_g_object_unref0 (_tmp40_);
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	d = _tmp42_;
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp52_ = d;
+	_tmp44_ = d;
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp52_ == RAW_DEVELOPER_SHOTWELL) {
+	if (_tmp44_ == RAW_DEVELOPER_SHOTWELL) {
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp51_ = "'Shotwell'";
-#line 2952 "MediaPage.c"
+		_tmp43_ = "Shotwell";
+#line 2884 "MediaPage.c"
 	} else {
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp51_ = "'Camera'";
-#line 2956 "MediaPage.c"
+		_tmp43_ = "Camera";
+#line 2888 "MediaPage.c"
 	}
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp53_ = action;
+	_tmp45_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp54_ = _variant_new25 (_tmp51_);
+	_tmp46_ = _tmp45_;
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp53_, _tmp54_);
+	_tmp47_ = _variant_new29 (_tmp43_);
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp54_);
-#line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (action);
-#line 2968 "MediaPage.c"
+	g_action_change_state (_tmp46_, _tmp47_);
+#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_variant_unref0 (_tmp47_);
+#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp46_);
+#line 2902 "MediaPage.c"
 }
 
 
@@ -3030,17 +2964,17 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin
 	_tmp11_ = desktop_integration_is_send_to_installed ();
 #line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp11_) {
-#line 3034 "MediaPage.c"
+#line 2968 "MediaPage.c"
 		gint _tmp12_ = 0;
 #line 353 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = selected_count;
 #line 353 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp12_ > 0);
-#line 3040 "MediaPage.c"
+#line 2974 "MediaPage.c"
 	} else {
 #line 355 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", FALSE);
-#line 3044 "MediaPage.c"
+#line 2978 "MediaPage.c"
 	}
 #line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = selected_count;
@@ -3054,7 +2988,7 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin
 	_tmp15_ = selected_count;
 #line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp15_ == 1) {
-#line 3058 "MediaPage.c"
+#line 2992 "MediaPage.c"
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
 		DataSource* _tmp18_ = NULL;
@@ -3073,11 +3007,11 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin
 		_g_object_unref0 (_tmp19_);
 #line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 3077 "MediaPage.c"
+#line 3011 "MediaPage.c"
 	} else {
 #line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = FALSE;
-#line 3081 "MediaPage.c"
+#line 3015 "MediaPage.c"
 	}
 #line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PlayVideo", _tmp14_);
@@ -3091,7 +3025,7 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin
 	_tmp22_ = count;
 #line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	PAGE_CLASS (media_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp21_, _tmp22_);
-#line 3095 "MediaPage.c"
+#line 3029 "MediaPage.c"
 }
 
 
@@ -3100,7 +3034,7 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 370 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 3104 "MediaPage.c"
+#line 3038 "MediaPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -3127,7 +3061,7 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 		_object_it = _tmp5_;
 #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3131 "MediaPage.c"
+#line 3065 "MediaPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -3147,7 +3081,7 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 			if (!_tmp7_) {
 #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3151 "MediaPage.c"
+#line 3085 "MediaPage.c"
 			}
 #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _object_it;
@@ -3171,7 +3105,7 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 			_alteration_unref0 (_tmp13_);
 #line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp15_) {
-#line 3175 "MediaPage.c"
+#line 3109 "MediaPage.c"
 				ViewCollection* _tmp16_ = NULL;
 				ViewCollection* _tmp17_ = NULL;
 				gint _tmp18_ = 0;
@@ -3189,15 +3123,15 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 				_g_object_unref0 (object);
 #line 375 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3193 "MediaPage.c"
+#line 3127 "MediaPage.c"
 			}
 #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (object);
-#line 3197 "MediaPage.c"
+#line 3131 "MediaPage.c"
 		}
 #line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_object_it);
-#line 3201 "MediaPage.c"
+#line 3135 "MediaPage.c"
 	}
 }
 
@@ -3250,7 +3184,7 @@ static void media_page_update_rating_sensitivities (MediaPage* self) {
 	_tmp8_ = media_page_can_decrease_selected_rating (self);
 #line 389 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp8_);
-#line 3254 "MediaPage.c"
+#line 3188 "MediaPage.c"
 }
 
 
@@ -3290,11 +3224,11 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", FALSE);
 #line 395 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 3294 "MediaPage.c"
+#line 3228 "MediaPage.c"
 	}
 #line 399 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	is_raw = FALSE;
-#line 3298 "MediaPage.c"
+#line 3232 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp7_ = NULL;
@@ -3330,7 +3264,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 		_view_index = -1;
 #line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3334 "MediaPage.c"
+#line 3268 "MediaPage.c"
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
 			gint _tmp16_ = 0;
@@ -3356,7 +3290,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 			if (!(_tmp15_ < _tmp16_)) {
 #line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3360 "MediaPage.c"
+#line 3294 "MediaPage.c"
 			}
 #line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = _view_list;
@@ -3376,7 +3310,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 			if (_tmp22_ == NULL) {
 #line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_tmp21_);
-#line 3380 "MediaPage.c"
+#line 3314 "MediaPage.c"
 			}
 #line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			photo = _tmp22_;
@@ -3384,7 +3318,7 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 			_tmp24_ = photo;
 #line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp24_ != NULL) {
-#line 3388 "MediaPage.c"
+#line 3322 "MediaPage.c"
 				Photo* _tmp25_ = NULL;
 				PhotoFileFormat _tmp26_ = 0;
 #line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -3393,11 +3327,11 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 				_tmp26_ = photo_get_master_file_format (_tmp25_);
 #line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = _tmp26_ == PHOTO_FILE_FORMAT_RAW;
-#line 3397 "MediaPage.c"
+#line 3331 "MediaPage.c"
 			} else {
 #line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = FALSE;
-#line 3401 "MediaPage.c"
+#line 3335 "MediaPage.c"
 			}
 #line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp23_) {
@@ -3409,23 +3343,23 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 				_g_object_unref0 (view);
 #line 405 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3413 "MediaPage.c"
+#line 3347 "MediaPage.c"
 			}
 #line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (photo);
 #line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3419 "MediaPage.c"
+#line 3353 "MediaPage.c"
 		}
 #line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3423 "MediaPage.c"
+#line 3357 "MediaPage.c"
 	}
 #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp27_ = is_raw;
 #line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp27_);
-#line 3429 "MediaPage.c"
+#line 3363 "MediaPage.c"
 }
 
 
@@ -3437,14 +3371,14 @@ static void media_page_update_flag_action (MediaPage* self, gint selected_count)
 	_tmp0_ = selected_count;
 #line 414 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_ > 0);
-#line 3441 "MediaPage.c"
+#line 3375 "MediaPage.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
 #line 418 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 3448 "MediaPage.c"
+#line 3382 "MediaPage.c"
 }
 
 
@@ -3463,7 +3397,7 @@ static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base
 	result = _tmp1_;
 #line 418 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3467 "MediaPage.c"
+#line 3401 "MediaPage.c"
 }
 
 
@@ -3515,7 +3449,7 @@ void media_page_set_display_ratings (MediaPage* self, gboolean display) {
 	_tmp8_ = display;
 #line 426 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings", _tmp8_);
-#line 3519 "MediaPage.c"
+#line 3453 "MediaPage.c"
 }
 
 
@@ -3523,7 +3457,7 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 	gboolean result = FALSE;
 #line 429 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3527 "MediaPage.c"
+#line 3461 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -3559,7 +3493,7 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 		_view_index = -1;
 #line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3563 "MediaPage.c"
+#line 3497 "MediaPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -3585,7 +3519,7 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 			if (!(_tmp8_ < _tmp9_)) {
 #line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3589 "MediaPage.c"
+#line 3523 "MediaPage.c"
 			}
 #line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
@@ -3619,21 +3553,21 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 				_g_object_unref0 (_view_list);
 #line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3623 "MediaPage.c"
+#line 3557 "MediaPage.c"
 			}
 #line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3627 "MediaPage.c"
+#line 3561 "MediaPage.c"
 		}
 #line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3631 "MediaPage.c"
+#line 3565 "MediaPage.c"
 	}
 #line 435 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
 #line 435 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3637 "MediaPage.c"
+#line 3571 "MediaPage.c"
 }
 
 
@@ -3641,7 +3575,7 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 	gboolean result = FALSE;
 #line 438 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3645 "MediaPage.c"
+#line 3579 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -3677,7 +3611,7 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 		_view_index = -1;
 #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3681 "MediaPage.c"
+#line 3615 "MediaPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -3703,7 +3637,7 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 			if (!(_tmp8_ < _tmp9_)) {
 #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3707 "MediaPage.c"
+#line 3641 "MediaPage.c"
 			}
 #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
@@ -3737,21 +3671,21 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 				_g_object_unref0 (_view_list);
 #line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3741 "MediaPage.c"
+#line 3675 "MediaPage.c"
 			}
 #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3745 "MediaPage.c"
+#line 3679 "MediaPage.c"
 		}
 #line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3749 "MediaPage.c"
+#line 3683 "MediaPage.c"
 	}
 #line 444 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
 #line 444 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3755 "MediaPage.c"
+#line 3689 "MediaPage.c"
 }
 
 
@@ -3759,7 +3693,7 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 	gboolean result = FALSE;
 #line 447 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3763 "MediaPage.c"
+#line 3697 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -3795,7 +3729,7 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 		_view_index = -1;
 #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3799 "MediaPage.c"
+#line 3733 "MediaPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -3821,7 +3755,7 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 			if (!(_tmp8_ < _tmp9_)) {
 #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3825 "MediaPage.c"
+#line 3759 "MediaPage.c"
 			}
 #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
@@ -3855,21 +3789,21 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 				_g_object_unref0 (_view_list);
 #line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3859 "MediaPage.c"
+#line 3793 "MediaPage.c"
 			}
 #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3863 "MediaPage.c"
+#line 3797 "MediaPage.c"
 		}
 #line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3867 "MediaPage.c"
+#line 3801 "MediaPage.c"
 	}
 #line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
 #line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3873 "MediaPage.c"
+#line 3807 "MediaPage.c"
 }
 
 
@@ -3886,7 +3820,7 @@ MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage*
 	result = _tmp0_;
 #line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3890 "MediaPage.c"
+#line 3824 "MediaPage.c"
 }
 
 
@@ -3911,7 +3845,7 @@ static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* ev
 		result = TRUE;
 #line 463 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3915 "MediaPage.c"
+#line 3849 "MediaPage.c"
 	} else {
 		GdkEventScroll* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
@@ -3923,7 +3857,7 @@ static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* ev
 		result = _tmp3_;
 #line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3927 "MediaPage.c"
+#line 3861 "MediaPage.c"
 	}
 }
 
@@ -3949,7 +3883,7 @@ static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll*
 		result = TRUE;
 #line 472 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3953 "MediaPage.c"
+#line 3887 "MediaPage.c"
 	} else {
 		GdkEventScroll* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
@@ -3961,7 +3895,7 @@ static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll*
 		result = _tmp3_;
 #line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3965 "MediaPage.c"
+#line 3899 "MediaPage.c"
 	}
 }
 
@@ -3987,7 +3921,7 @@ static void media_page_on_send_to (MediaPage* self) {
 	_g_object_unref0 (_tmp3_);
 #line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3991 "MediaPage.c"
+#line 3925 "MediaPage.c"
 }
 
 
@@ -4022,7 +3956,7 @@ void media_page_on_play_video (MediaPage* self) {
 	if (_tmp3_) {
 #line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4026 "MediaPage.c"
+#line 3960 "MediaPage.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -4040,7 +3974,7 @@ void media_page_on_play_video (MediaPage* self) {
 	if (_tmp9_ == NULL) {
 #line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 4044 "MediaPage.c"
+#line 3978 "MediaPage.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = _tmp9_;
@@ -4058,7 +3992,7 @@ void media_page_on_play_video (MediaPage* self) {
 		_g_object_unref0 (video);
 #line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4062 "MediaPage.c"
+#line 3996 "MediaPage.c"
 	}
 	{
 		Video* _tmp12_ = NULL;
@@ -4084,12 +4018,12 @@ void media_page_on_play_video (MediaPage* self) {
 		_g_object_unref0 (_tmp14_);
 #line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4088 "MediaPage.c"
-			goto __catch558_g_error;
+#line 4022 "MediaPage.c"
+			goto __catch556_g_error;
 		}
 	}
-	goto __finally558;
-	__catch558_g_error:
+	goto __finally556;
+	__catch556_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -4117,9 +4051,9 @@ void media_page_on_play_video (MediaPage* self) {
 		_g_free0 (_tmp21_);
 #line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_error_free0 (e);
-#line 4121 "MediaPage.c"
+#line 4055 "MediaPage.c"
 	}
-	__finally558:
+	__finally556:
 #line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4130,11 +4064,11 @@ void media_page_on_play_video (MediaPage* self) {
 		g_clear_error (&_inner_error_);
 #line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4134 "MediaPage.c"
+#line 4068 "MediaPage.c"
 	}
 #line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (video);
-#line 4138 "MediaPage.c"
+#line 4072 "MediaPage.c"
 }
 
 
@@ -4195,7 +4129,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 	static GQuark _tmp4_label22 = 0;
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label23 = 0;
-#line 4199 "MediaPage.c"
+#line 4133 "MediaPage.c"
 	gboolean _tmp30_ = FALSE;
 	gboolean _tmp31_ = FALSE;
 #line 498 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4218,150 +4152,150 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 	if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4222 "MediaPage.c"
+#line 4156 "MediaPage.c"
 			default:
 			{
 #line 504 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
 #line 505 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4229 "MediaPage.c"
+#line 4163 "MediaPage.c"
 			}
 		}
 	} else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4235 "MediaPage.c"
+#line 4169 "MediaPage.c"
 			default:
 			{
 #line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
 #line 511 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4242 "MediaPage.c"
+#line 4176 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("period")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4248 "MediaPage.c"
+#line 4182 "MediaPage.c"
 			default:
 			{
 #line 514 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
 #line 515 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4255 "MediaPage.c"
+#line 4189 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("comma")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4261 "MediaPage.c"
+#line 4195 "MediaPage.c"
 			default:
 			{
 #line 518 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
 #line 519 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4268 "MediaPage.c"
+#line 4202 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("KP_1")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4274 "MediaPage.c"
+#line 4208 "MediaPage.c"
 			default:
 			{
 #line 522 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
 #line 523 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4281 "MediaPage.c"
+#line 4215 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("KP_2")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4287 "MediaPage.c"
+#line 4221 "MediaPage.c"
 			default:
 			{
 #line 526 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
 #line 527 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4294 "MediaPage.c"
+#line 4228 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label10) ? _tmp4_label10 : (_tmp4_label10 = g_quark_from_static_string ("KP_3")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4300 "MediaPage.c"
+#line 4234 "MediaPage.c"
 			default:
 			{
 #line 530 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
 #line 531 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4307 "MediaPage.c"
+#line 4241 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label11) ? _tmp4_label11 : (_tmp4_label11 = g_quark_from_static_string ("KP_4")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4313 "MediaPage.c"
+#line 4247 "MediaPage.c"
 			default:
 			{
 #line 534 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
 #line 535 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4320 "MediaPage.c"
+#line 4254 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label12) ? _tmp4_label12 : (_tmp4_label12 = g_quark_from_static_string ("KP_5")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4326 "MediaPage.c"
+#line 4260 "MediaPage.c"
 			default:
 			{
 #line 538 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
 #line 539 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4333 "MediaPage.c"
+#line 4267 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label13) ? _tmp4_label13 : (_tmp4_label13 = g_quark_from_static_string ("KP_0")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4339 "MediaPage.c"
+#line 4273 "MediaPage.c"
 			default:
 			{
 #line 542 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
 #line 543 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4346 "MediaPage.c"
+#line 4280 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label14) ? _tmp4_label14 : (_tmp4_label14 = g_quark_from_static_string ("KP_9")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4352 "MediaPage.c"
+#line 4286 "MediaPage.c"
 			default:
 			{
 #line 546 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
 #line 547 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4359 "MediaPage.c"
+#line 4293 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label15) ? _tmp4_label15 : (_tmp4_label15 = g_quark_from_static_string ("exclam")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4365 "MediaPage.c"
+#line 4299 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp6_ = FALSE;
@@ -4369,7 +4303,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 				_tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 550 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp6_) {
-#line 4373 "MediaPage.c"
+#line 4307 "MediaPage.c"
 					SearchViewFilter* _tmp7_ = NULL;
 					SearchViewFilter* _tmp8_ = NULL;
 #line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4380,17 +4314,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp8_, RATING_FILTER_ONE_OR_HIGHER);
 #line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp8_);
-#line 4384 "MediaPage.c"
+#line 4318 "MediaPage.c"
 				}
 #line 552 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4388 "MediaPage.c"
+#line 4322 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label16) ? _tmp4_label16 : (_tmp4_label16 = g_quark_from_static_string ("at")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4394 "MediaPage.c"
+#line 4328 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp9_ = FALSE;
@@ -4398,7 +4332,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 				_tmp9_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 555 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp9_) {
-#line 4402 "MediaPage.c"
+#line 4336 "MediaPage.c"
 					SearchViewFilter* _tmp10_ = NULL;
 					SearchViewFilter* _tmp11_ = NULL;
 #line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4409,17 +4343,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp11_, RATING_FILTER_TWO_OR_HIGHER);
 #line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp11_);
-#line 4413 "MediaPage.c"
+#line 4347 "MediaPage.c"
 				}
 #line 557 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4417 "MediaPage.c"
+#line 4351 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label17) ? _tmp4_label17 : (_tmp4_label17 = g_quark_from_static_string ("numbersign")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4423 "MediaPage.c"
+#line 4357 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp12_ = FALSE;
@@ -4427,7 +4361,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 				_tmp12_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp12_) {
-#line 4431 "MediaPage.c"
+#line 4365 "MediaPage.c"
 					SearchViewFilter* _tmp13_ = NULL;
 					SearchViewFilter* _tmp14_ = NULL;
 #line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4438,17 +4372,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp14_, RATING_FILTER_THREE_OR_HIGHER);
 #line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp14_);
-#line 4442 "MediaPage.c"
+#line 4376 "MediaPage.c"
 				}
 #line 562 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4446 "MediaPage.c"
+#line 4380 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label18) ? _tmp4_label18 : (_tmp4_label18 = g_quark_from_static_string ("dollar")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4452 "MediaPage.c"
+#line 4386 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
@@ -4456,7 +4390,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 				_tmp15_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 565 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp15_) {
-#line 4460 "MediaPage.c"
+#line 4394 "MediaPage.c"
 					SearchViewFilter* _tmp16_ = NULL;
 					SearchViewFilter* _tmp17_ = NULL;
 #line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4467,17 +4401,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp17_, RATING_FILTER_FOUR_OR_HIGHER);
 #line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp17_);
-#line 4471 "MediaPage.c"
+#line 4405 "MediaPage.c"
 				}
 #line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4475 "MediaPage.c"
+#line 4409 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label19) ? _tmp4_label19 : (_tmp4_label19 = g_quark_from_static_string ("percent")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4481 "MediaPage.c"
+#line 4415 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp18_ = FALSE;
@@ -4485,7 +4419,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 				_tmp18_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp18_) {
-#line 4489 "MediaPage.c"
+#line 4423 "MediaPage.c"
 					SearchViewFilter* _tmp19_ = NULL;
 					SearchViewFilter* _tmp20_ = NULL;
 #line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4496,17 +4430,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp20_, RATING_FILTER_FIVE_OR_HIGHER);
 #line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp20_);
-#line 4500 "MediaPage.c"
+#line 4434 "MediaPage.c"
 				}
 #line 572 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4504 "MediaPage.c"
+#line 4438 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label20) ? _tmp4_label20 : (_tmp4_label20 = g_quark_from_static_string ("parenright")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4510 "MediaPage.c"
+#line 4444 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp21_ = FALSE;
@@ -4514,7 +4448,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 				_tmp21_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp21_) {
-#line 4518 "MediaPage.c"
+#line 4452 "MediaPage.c"
 					SearchViewFilter* _tmp22_ = NULL;
 					SearchViewFilter* _tmp23_ = NULL;
 #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4525,17 +4459,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp23_, RATING_FILTER_UNRATED_OR_HIGHER);
 #line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp23_);
-#line 4529 "MediaPage.c"
+#line 4463 "MediaPage.c"
 				}
 #line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4533 "MediaPage.c"
+#line 4467 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label21) ? _tmp4_label21 : (_tmp4_label21 = g_quark_from_static_string ("parenleft")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4539 "MediaPage.c"
+#line 4473 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp24_ = FALSE;
@@ -4543,7 +4477,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 				_tmp24_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 580 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp24_) {
-#line 4547 "MediaPage.c"
+#line 4481 "MediaPage.c"
 					SearchViewFilter* _tmp25_ = NULL;
 					SearchViewFilter* _tmp26_ = NULL;
 #line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4554,17 +4488,17 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp26_, RATING_FILTER_REJECTED_OR_HIGHER);
 #line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp26_);
-#line 4558 "MediaPage.c"
+#line 4492 "MediaPage.c"
 				}
 #line 582 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4562 "MediaPage.c"
+#line 4496 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label22) ? _tmp4_label22 : (_tmp4_label22 = g_quark_from_static_string ("asterisk")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4568 "MediaPage.c"
+#line 4502 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp27_ = FALSE;
@@ -4572,7 +4506,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 				_tmp27_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp27_) {
-#line 4576 "MediaPage.c"
+#line 4510 "MediaPage.c"
 					SearchViewFilter* _tmp28_ = NULL;
 					SearchViewFilter* _tmp29_ = NULL;
 #line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4583,37 +4517,37 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 					search_view_filter_set_rating_filter (_tmp29_, RATING_FILTER_REJECTED_ONLY);
 #line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp29_);
-#line 4587 "MediaPage.c"
+#line 4521 "MediaPage.c"
 				}
 #line 587 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4591 "MediaPage.c"
+#line 4525 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label23) ? _tmp4_label23 : (_tmp4_label23 = g_quark_from_static_string ("slash")))) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4597 "MediaPage.c"
+#line 4531 "MediaPage.c"
 			default:
 			{
 #line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
 #line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4604 "MediaPage.c"
+#line 4538 "MediaPage.c"
 			}
 		}
 	} else {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4610 "MediaPage.c"
+#line 4544 "MediaPage.c"
 			default:
 			{
 #line 594 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				handled = FALSE;
 #line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4617 "MediaPage.c"
+#line 4551 "MediaPage.c"
 			}
 		}
 	}
@@ -4623,7 +4557,7 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 	if (_tmp31_) {
 #line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp30_ = TRUE;
-#line 4627 "MediaPage.c"
+#line 4561 "MediaPage.c"
 	} else {
 		GdkEventKey* _tmp32_ = NULL;
 		gboolean _tmp33_ = FALSE;
@@ -4633,13 +4567,13 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 		_tmp33_ = PAGE_CLASS (media_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp32_);
 #line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp30_ = _tmp33_;
-#line 4637 "MediaPage.c"
+#line 4571 "MediaPage.c"
 	}
 #line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp30_;
 #line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 4643 "MediaPage.c"
+#line 4577 "MediaPage.c"
 }
 
 
@@ -4737,7 +4671,7 @@ static void media_page_real_switched_to (Page* base) {
 	_data_collection_unref0 (_tmp17_);
 #line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp19_) {
-#line 4741 "MediaPage.c"
+#line 4675 "MediaPage.c"
 		CheckerboardItem* selected = NULL;
 		ViewCollection* _tmp20_ = NULL;
 		ViewCollection* _tmp21_ = NULL;
@@ -4760,21 +4694,21 @@ static void media_page_real_switched_to (Page* base) {
 		_tmp24_ = selected;
 #line 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (_tmp24_ != NULL) {
-#line 4764 "MediaPage.c"
+#line 4698 "MediaPage.c"
 			CheckerboardItem* _tmp25_ = NULL;
 #line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp25_ = selected;
 #line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			checkerboard_page_cursor_to_item (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp25_);
-#line 4770 "MediaPage.c"
+#line 4704 "MediaPage.c"
 		}
 #line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (selected);
-#line 4774 "MediaPage.c"
+#line 4708 "MediaPage.c"
 	}
 #line 620 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_sync_sort (self);
-#line 4778 "MediaPage.c"
+#line 4712 "MediaPage.c"
 }
 
 
@@ -4786,21 +4720,21 @@ static void media_page_real_switching_from (Page* base) {
 	media_page_disconnect_slider (self);
 #line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	PAGE_CLASS (media_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
-#line 4790 "MediaPage.c"
+#line 4724 "MediaPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 4797 "MediaPage.c"
+#line 4731 "MediaPage.c"
 }
 
 
 static void _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender, gpointer self) {
 #line 631 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_zoom_changed ((MediaPage*) self);
-#line 4804 "MediaPage.c"
+#line 4738 "MediaPage.c"
 }
 
 
@@ -4826,7 +4760,7 @@ void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* sl
 	g_signal_connect_object (_tmp2_, "zoom-changed", (GCallback) _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed, self, 0);
 #line 632 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_load_persistent_thumbnail_scale (self);
-#line 4830 "MediaPage.c"
+#line 4764 "MediaPage.c"
 }
 
 
@@ -4844,7 +4778,7 @@ static void media_page_save_persistent_thumbnail_scale (MediaPage* self) {
 	if (_tmp0_ == NULL) {
 #line 637 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4848 "MediaPage.c"
+#line 4782 "MediaPage.c"
 	}
 #line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = config_facade_get_instance ();
@@ -4858,7 +4792,7 @@ static void media_page_save_persistent_thumbnail_scale (MediaPage* self) {
 	configuration_facade_set_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
 #line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 4862 "MediaPage.c"
+#line 4796 "MediaPage.c"
 }
 
 
@@ -4880,7 +4814,7 @@ static void media_page_load_persistent_thumbnail_scale (MediaPage* self) {
 	if (_tmp0_ == NULL) {
 #line 644 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4884 "MediaPage.c"
+#line 4818 "MediaPage.c"
 	}
 #line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = config_facade_get_instance ();
@@ -4904,7 +4838,7 @@ static void media_page_load_persistent_thumbnail_scale (MediaPage* self) {
 	_tmp7_ = persistent_scale;
 #line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_thumb_size (self, _tmp7_);
-#line 4908 "MediaPage.c"
+#line 4842 "MediaPage.c"
 }
 
 
@@ -4920,7 +4854,7 @@ void media_page_disconnect_slider (MediaPage* self) {
 	if (_tmp0_ == NULL) {
 #line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4924 "MediaPage.c"
+#line 4858 "MediaPage.c"
 	}
 #line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = self->priv->connected_slider;
@@ -4932,7 +4866,7 @@ void media_page_disconnect_slider (MediaPage* self) {
 	_g_object_unref0 (self->priv->connected_slider);
 #line 657 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->connected_slider = NULL;
-#line 4936 "MediaPage.c"
+#line 4870 "MediaPage.c"
 }
 
 
@@ -4942,7 +4876,7 @@ static void media_page_real_on_zoom_changed (MediaPage* self) {
 	_tmp0_ = self->priv->connected_slider;
 #line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 4946 "MediaPage.c"
+#line 4880 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 #line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -4951,11 +4885,11 @@ static void media_page_real_on_zoom_changed (MediaPage* self) {
 		_tmp2_ = media_page_zoom_slider_assembly_get_scale (_tmp1_);
 #line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp2_);
-#line 4955 "MediaPage.c"
+#line 4889 "MediaPage.c"
 	}
 #line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_save_persistent_thumbnail_scale (self);
-#line 4959 "MediaPage.c"
+#line 4893 "MediaPage.c"
 }
 
 
@@ -4964,7 +4898,7 @@ void media_page_on_zoom_changed (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_zoom_changed (self);
-#line 4968 "MediaPage.c"
+#line 4902 "MediaPage.c"
 }
 
 
@@ -4973,7 +4907,7 @@ static void media_page_real_on_export (MediaPage* self) {
 	g_critical ("Type `%s' does not implement abstract method `media_page_on_export'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 4977 "MediaPage.c"
+#line 4911 "MediaPage.c"
 }
 
 
@@ -4982,14 +4916,14 @@ void media_page_on_export (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_export (self);
-#line 4986 "MediaPage.c"
+#line 4920 "MediaPage.c"
 }
 
 
 static void media_page_real_on_increase_size (MediaPage* self) {
 #line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_increase_zoom_level (self);
-#line 4993 "MediaPage.c"
+#line 4927 "MediaPage.c"
 }
 
 
@@ -4998,14 +4932,14 @@ void media_page_on_increase_size (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 5002 "MediaPage.c"
+#line 4936 "MediaPage.c"
 }
 
 
 static void media_page_real_on_decrease_size (MediaPage* self) {
 #line 674 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_decrease_zoom_level (self);
-#line 5009 "MediaPage.c"
+#line 4943 "MediaPage.c"
 }
 
 
@@ -5014,7 +4948,7 @@ void media_page_on_decrease_size (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 673 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 5018 "MediaPage.c"
+#line 4952 "MediaPage.c"
 }
 
 
@@ -5049,7 +4983,7 @@ static void media_page_on_add_tags (MediaPage* self) {
 	if (_tmp3_) {
 #line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5053 "MediaPage.c"
+#line 4987 "MediaPage.c"
 	}
 #line 681 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = add_tags_dialog_new ();
@@ -5071,7 +5005,7 @@ static void media_page_on_add_tags (MediaPage* self) {
 	_tmp8__length1 = names_length1;
 #line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp8_ != NULL) {
-#line 5075 "MediaPage.c"
+#line 5009 "MediaPage.c"
 		CommandManager* _tmp9_ = NULL;
 		CommandManager* _tmp10_ = NULL;
 		HierarchicalTagIndex* _tmp11_ = NULL;
@@ -5132,13 +5066,13 @@ static void media_page_on_add_tags (MediaPage* self) {
 		_hierarchical_tag_index_unref0 (_tmp12_);
 #line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp10_);
-#line 5136 "MediaPage.c"
+#line 5070 "MediaPage.c"
 	}
 #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
 #line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 5142 "MediaPage.c"
+#line 5076 "MediaPage.c"
 }
 
 
@@ -5183,7 +5117,7 @@ static void media_page_on_modify_tags (MediaPage* self) {
 	if (_tmp3_) {
 #line 693 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5187 "MediaPage.c"
+#line 5121 "MediaPage.c"
 	}
 #line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5227,7 +5161,7 @@ static void media_page_on_modify_tags (MediaPage* self) {
 		_g_object_unref0 (media);
 #line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5231 "MediaPage.c"
+#line 5165 "MediaPage.c"
 	}
 #line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5253,7 +5187,7 @@ static void media_page_on_modify_tags (MediaPage* self) {
 	_text_entry_dialog_mediator_unref0 (dialog);
 #line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media);
-#line 5257 "MediaPage.c"
+#line 5191 "MediaPage.c"
 }
 
 
@@ -5305,7 +5239,7 @@ static void media_page_set_display_tags (MediaPage* self, gboolean display) {
 	_tmp8_ = display;
 #line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags", _tmp8_);
-#line 5309 "MediaPage.c"
+#line 5243 "MediaPage.c"
 }
 
 
@@ -5328,7 +5262,7 @@ static void media_page_on_new_event (MediaPage* self) {
 	_data_collection_unref0 (_tmp1_);
 #line 715 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 5332 "MediaPage.c"
+#line 5266 "MediaPage.c"
 		CommandManager* _tmp4_ = NULL;
 		CommandManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
@@ -5363,7 +5297,7 @@ static void media_page_on_new_event (MediaPage* self) {
 		_data_collection_unref0 (_tmp7_);
 #line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 5367 "MediaPage.c"
+#line 5301 "MediaPage.c"
 	}
 }
 
@@ -5401,7 +5335,7 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 	if (_tmp3_) {
 #line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5405 "MediaPage.c"
+#line 5339 "MediaPage.c"
 	}
 #line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5417,7 +5351,7 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 	sources = _tmp7_;
 #line 727 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	flag = FALSE;
-#line 5421 "MediaPage.c"
+#line 5355 "MediaPage.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp8_ = NULL;
@@ -5430,7 +5364,7 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 		_source_it = _tmp9_;
 #line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 5434 "MediaPage.c"
+#line 5368 "MediaPage.c"
 			GeeIterator* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
 			MediaSource* source = NULL;
@@ -5449,7 +5383,7 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 			if (!_tmp11_) {
 #line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5453 "MediaPage.c"
+#line 5387 "MediaPage.c"
 			}
 #line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = _source_it;
@@ -5467,7 +5401,7 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 			_tmp17_ = flaggable;
 #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp17_ != NULL) {
-#line 5471 "MediaPage.c"
+#line 5405 "MediaPage.c"
 				Flaggable* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
 #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -5476,11 +5410,11 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 				_tmp19_ = flaggable_is_flagged (_tmp18_);
 #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = !_tmp19_;
-#line 5480 "MediaPage.c"
+#line 5414 "MediaPage.c"
 			} else {
 #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = FALSE;
-#line 5484 "MediaPage.c"
+#line 5418 "MediaPage.c"
 			}
 #line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp16_) {
@@ -5492,17 +5426,17 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 				_g_object_unref0 (source);
 #line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5496 "MediaPage.c"
+#line 5430 "MediaPage.c"
 			}
 #line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (flaggable);
 #line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (source);
-#line 5502 "MediaPage.c"
+#line 5436 "MediaPage.c"
 		}
 #line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_source_it);
-#line 5506 "MediaPage.c"
+#line 5440 "MediaPage.c"
 	}
 #line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5524,7 +5458,7 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 	_command_manager_unref0 (_tmp21_);
 #line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (sources);
-#line 5528 "MediaPage.c"
+#line 5462 "MediaPage.c"
 }
 
 
@@ -5557,7 +5491,7 @@ static void media_page_real_on_increase_rating (MediaPage* self) {
 	if (_tmp3_) {
 #line 742 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5561 "MediaPage.c"
+#line 5495 "MediaPage.c"
 	}
 #line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5591,7 +5525,7 @@ static void media_page_real_on_increase_rating (MediaPage* self) {
 	media_page_update_rating_sensitivities (self);
 #line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5595 "MediaPage.c"
+#line 5529 "MediaPage.c"
 }
 
 
@@ -5600,7 +5534,7 @@ void media_page_on_increase_rating (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_increase_rating (self);
-#line 5604 "MediaPage.c"
+#line 5538 "MediaPage.c"
 }
 
 
@@ -5633,7 +5567,7 @@ static void media_page_real_on_decrease_rating (MediaPage* self) {
 	if (_tmp3_) {
 #line 752 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5637 "MediaPage.c"
+#line 5571 "MediaPage.c"
 	}
 #line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5667,7 +5601,7 @@ static void media_page_real_on_decrease_rating (MediaPage* self) {
 	media_page_update_rating_sensitivities (self);
 #line 750 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5671 "MediaPage.c"
+#line 5605 "MediaPage.c"
 }
 
 
@@ -5676,7 +5610,7 @@ void media_page_on_decrease_rating (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 750 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_decrease_rating (self);
-#line 5680 "MediaPage.c"
+#line 5614 "MediaPage.c"
 }
 
 
@@ -5710,7 +5644,7 @@ static void media_page_real_on_set_rating (MediaPage* self, Rating rating) {
 	if (_tmp3_) {
 #line 762 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5714 "MediaPage.c"
+#line 5648 "MediaPage.c"
 	}
 #line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5746,7 +5680,7 @@ static void media_page_real_on_set_rating (MediaPage* self, Rating rating) {
 	media_page_update_rating_sensitivities (self);
 #line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5750 "MediaPage.c"
+#line 5684 "MediaPage.c"
 }
 
 
@@ -5755,14 +5689,14 @@ void media_page_on_set_rating (MediaPage* self, Rating rating) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_set_rating (self, rating);
-#line 5759 "MediaPage.c"
+#line 5693 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_rejected (MediaPage* self) {
 #line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_REJECTED);
-#line 5766 "MediaPage.c"
+#line 5700 "MediaPage.c"
 }
 
 
@@ -5771,14 +5705,14 @@ void media_page_on_rate_rejected (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 770 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_rejected (self);
-#line 5775 "MediaPage.c"
+#line 5709 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_unrated (MediaPage* self) {
 #line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_UNRATED);
-#line 5782 "MediaPage.c"
+#line 5716 "MediaPage.c"
 }
 
 
@@ -5787,14 +5721,14 @@ void media_page_on_rate_unrated (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_unrated (self);
-#line 5791 "MediaPage.c"
+#line 5725 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_one (MediaPage* self) {
 #line 779 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_ONE);
-#line 5798 "MediaPage.c"
+#line 5732 "MediaPage.c"
 }
 
 
@@ -5803,14 +5737,14 @@ void media_page_on_rate_one (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 778 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_one (self);
-#line 5807 "MediaPage.c"
+#line 5741 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_two (MediaPage* self) {
 #line 783 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_TWO);
-#line 5814 "MediaPage.c"
+#line 5748 "MediaPage.c"
 }
 
 
@@ -5819,14 +5753,14 @@ void media_page_on_rate_two (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 782 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_two (self);
-#line 5823 "MediaPage.c"
+#line 5757 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_three (MediaPage* self) {
 #line 787 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_THREE);
-#line 5830 "MediaPage.c"
+#line 5764 "MediaPage.c"
 }
 
 
@@ -5835,14 +5769,14 @@ void media_page_on_rate_three (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 786 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_three (self);
-#line 5839 "MediaPage.c"
+#line 5773 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_four (MediaPage* self) {
 #line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_FOUR);
-#line 5846 "MediaPage.c"
+#line 5780 "MediaPage.c"
 }
 
 
@@ -5851,14 +5785,14 @@ void media_page_on_rate_four (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 790 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_four (self);
-#line 5855 "MediaPage.c"
+#line 5789 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_five (MediaPage* self) {
 #line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_FIVE);
-#line 5862 "MediaPage.c"
+#line 5796 "MediaPage.c"
 }
 
 
@@ -5867,7 +5801,7 @@ void media_page_on_rate_five (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 794 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_five (self);
-#line 5871 "MediaPage.c"
+#line 5805 "MediaPage.c"
 }
 
 
@@ -5892,7 +5826,7 @@ static void media_page_on_remove_from_library (MediaPage* self) {
 	_g_object_unref0 (_tmp3_);
 #line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 5896 "MediaPage.c"
+#line 5830 "MediaPage.c"
 }
 
 
@@ -5911,7 +5845,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)->cursor;
 #line 805 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 5915 "MediaPage.c"
+#line 5849 "MediaPage.c"
 		ViewCollection* _tmp1_ = NULL;
 		ViewCollection* _tmp2_ = NULL;
 		CheckerboardItem* _tmp3_ = NULL;
@@ -5931,7 +5865,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 		if (_tmp5_ == NULL) {
 #line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp4_);
-#line 5935 "MediaPage.c"
+#line 5869 "MediaPage.c"
 		}
 #line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (restore_point);
@@ -5939,7 +5873,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 		restore_point = _tmp5_;
 #line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 5943 "MediaPage.c"
+#line 5877 "MediaPage.c"
 	}
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5953,7 +5887,7 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 	_data_collection_unref0 (_tmp7_);
 #line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp9_) {
-#line 5957 "MediaPage.c"
+#line 5891 "MediaPage.c"
 		CommandManager* _tmp10_ = NULL;
 		CommandManager* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
@@ -5988,13 +5922,13 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 		_data_collection_unref0 (_tmp13_);
 #line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp11_);
-#line 5992 "MediaPage.c"
+#line 5926 "MediaPage.c"
 	}
 #line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = restore_point;
 #line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp19_ != NULL) {
-#line 5998 "MediaPage.c"
+#line 5932 "MediaPage.c"
 		ViewCollection* _tmp20_ = NULL;
 		ViewCollection* _tmp21_ = NULL;
 		CheckerboardItem* _tmp22_ = NULL;
@@ -6011,25 +5945,25 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 		_tmp18_ = _tmp23_;
 #line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp21_);
-#line 6015 "MediaPage.c"
+#line 5949 "MediaPage.c"
 	} else {
 #line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = FALSE;
-#line 6019 "MediaPage.c"
+#line 5953 "MediaPage.c"
 	}
 #line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp18_) {
-#line 6023 "MediaPage.c"
+#line 5957 "MediaPage.c"
 		CheckerboardItem* _tmp24_ = NULL;
 #line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp24_ = restore_point;
 #line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		checkerboard_page_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp24_);
-#line 6029 "MediaPage.c"
+#line 5963 "MediaPage.c"
 	}
 #line 802 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (restore_point);
-#line 6033 "MediaPage.c"
+#line 5967 "MediaPage.c"
 }
 
 
@@ -6038,7 +5972,7 @@ void media_page_on_move_to_trash (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 802 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_move_to_trash (self);
-#line 6042 "MediaPage.c"
+#line 5976 "MediaPage.c"
 }
 
 
@@ -6078,7 +6012,7 @@ static void media_page_real_on_edit_title (MediaPage* self) {
 	if (_tmp3_) {
 #line 821 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6082 "MediaPage.c"
+#line 6016 "MediaPage.c"
 	}
 #line 823 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6122,7 +6056,7 @@ static void media_page_real_on_edit_title (MediaPage* self) {
 	_tmp17_ = new_title;
 #line 827 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp17_ != NULL) {
-#line 6126 "MediaPage.c"
+#line 6060 "MediaPage.c"
 		CommandManager* _tmp18_ = NULL;
 		CommandManager* _tmp19_ = NULL;
 		GeeList* _tmp20_ = NULL;
@@ -6147,7 +6081,7 @@ static void media_page_real_on_edit_title (MediaPage* self) {
 		_g_object_unref0 (_tmp23_);
 #line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp19_);
-#line 6151 "MediaPage.c"
+#line 6085 "MediaPage.c"
 	}
 #line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (new_title);
@@ -6155,7 +6089,7 @@ static void media_page_real_on_edit_title (MediaPage* self) {
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
 #line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media_sources);
-#line 6159 "MediaPage.c"
+#line 6093 "MediaPage.c"
 }
 
 
@@ -6164,7 +6098,7 @@ void media_page_on_edit_title (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_edit_title (self);
-#line 6168 "MediaPage.c"
+#line 6102 "MediaPage.c"
 }
 
 
@@ -6204,7 +6138,7 @@ static void media_page_real_on_edit_comment (MediaPage* self) {
 	if (_tmp3_) {
 #line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6208 "MediaPage.c"
+#line 6142 "MediaPage.c"
 	}
 #line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6248,7 +6182,7 @@ static void media_page_real_on_edit_comment (MediaPage* self) {
 	_tmp17_ = new_comment;
 #line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp17_ != NULL) {
-#line 6252 "MediaPage.c"
+#line 6186 "MediaPage.c"
 		CommandManager* _tmp18_ = NULL;
 		CommandManager* _tmp19_ = NULL;
 		GeeList* _tmp20_ = NULL;
@@ -6273,7 +6207,7 @@ static void media_page_real_on_edit_comment (MediaPage* self) {
 		_g_object_unref0 (_tmp23_);
 #line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp19_);
-#line 6277 "MediaPage.c"
+#line 6211 "MediaPage.c"
 	}
 #line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (new_comment);
@@ -6281,7 +6215,7 @@ static void media_page_real_on_edit_comment (MediaPage* self) {
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media_sources);
-#line 6285 "MediaPage.c"
+#line 6219 "MediaPage.c"
 }
 
 
@@ -6290,7 +6224,7 @@ void media_page_on_edit_comment (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_edit_comment (self);
-#line 6294 "MediaPage.c"
+#line 6228 "MediaPage.c"
 }
 
 
@@ -6326,7 +6260,7 @@ static void media_page_real_on_display_titles (MediaPage* self, GSimpleAction* a
 	_tmp5_ = value;
 #line 849 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6330 "MediaPage.c"
+#line 6264 "MediaPage.c"
 }
 
 
@@ -6335,7 +6269,7 @@ void media_page_on_display_titles (MediaPage* self, GSimpleAction* action, GVari
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_titles (self, action, value);
-#line 6339 "MediaPage.c"
+#line 6273 "MediaPage.c"
 }
 
 
@@ -6371,7 +6305,7 @@ static void media_page_real_on_display_comments (MediaPage* self, GSimpleAction*
 	_tmp5_ = value;
 #line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6375 "MediaPage.c"
+#line 6309 "MediaPage.c"
 }
 
 
@@ -6380,7 +6314,7 @@ void media_page_on_display_comments (MediaPage* self, GSimpleAction* action, GVa
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 852 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_comments (self, action, value);
-#line 6384 "MediaPage.c"
+#line 6318 "MediaPage.c"
 }
 
 
@@ -6416,7 +6350,7 @@ static void media_page_real_on_display_ratings (MediaPage* self, GSimpleAction*
 	_tmp5_ = value;
 #line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6420 "MediaPage.c"
+#line 6354 "MediaPage.c"
 }
 
 
@@ -6425,7 +6359,7 @@ void media_page_on_display_ratings (MediaPage* self, GSimpleAction* action, GVar
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 861 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_ratings (self, action, value);
-#line 6429 "MediaPage.c"
+#line 6363 "MediaPage.c"
 }
 
 
@@ -6461,7 +6395,7 @@ static void media_page_real_on_display_tags (MediaPage* self, GSimpleAction* act
 	_tmp5_ = value;
 #line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6465 "MediaPage.c"
+#line 6399 "MediaPage.c"
 }
 
 
@@ -6470,7 +6404,7 @@ void media_page_on_display_tags (MediaPage* self, GSimpleAction* action, GVarian
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 870 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_tags (self, action, value);
-#line 6474 "MediaPage.c"
+#line 6408 "MediaPage.c"
 }
 
 
@@ -6479,7 +6413,7 @@ static void media_page_real_get_config_photos_sort (MediaPage* self, gboolean* s
 	g_critical ("Type `%s' does not implement abstract method `media_page_get_config_photos_sort'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 879 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 6483 "MediaPage.c"
+#line 6417 "MediaPage.c"
 }
 
 
@@ -6488,7 +6422,7 @@ void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, g
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 879 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->get_config_photos_sort (self, sort_order, sort_by);
-#line 6492 "MediaPage.c"
+#line 6426 "MediaPage.c"
 }
 
 
@@ -6497,7 +6431,7 @@ static void media_page_real_set_config_photos_sort (MediaPage* self, gboolean so
 	g_critical ("Type `%s' does not implement abstract method `media_page_set_config_photos_sort'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 6501 "MediaPage.c"
+#line 6435 "MediaPage.c"
 }
 
 
@@ -6506,38 +6440,38 @@ void media_page_set_config_photos_sort (MediaPage* self, gboolean sort_order, gi
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->set_config_photos_sort (self, sort_order, sort_by);
-#line 6510 "MediaPage.c"
+#line 6444 "MediaPage.c"
 }
 
 
 static void media_page_real_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value) {
+	GSimpleAction* _tmp0_ = NULL;
+	GVariant* _tmp1_ = NULL;
 	gint sort_by = 0;
-	gint _tmp0_ = 0;
+	gint _tmp2_ = 0;
 	gboolean sort_order = FALSE;
-	gboolean _tmp1_ = FALSE;
-	GSimpleAction* _tmp2_ = NULL;
-	GVariant* _tmp3_ = NULL;
+	gboolean _tmp3_ = FALSE;
 #line 883 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 884 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = media_page_get_menu_sort_by (self);
+	_tmp0_ = action;
+#line 884 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp1_ = value;
 #line 884 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_by = _tmp0_;
-#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = media_page_get_menu_sort_order (self);
-#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_order = _tmp1_;
+	g_simple_action_set_state (_tmp0_, _tmp1_);
+#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp2_ = media_page_get_menu_sort_by (self);
+#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	sort_by = _tmp2_;
 #line 887 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp3_ = media_page_get_menu_sort_order (self);
+#line 887 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	sort_order = _tmp3_;
+#line 889 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_view_comparator (self, sort_by, sort_order);
-#line 888 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_set_config_photos_sort (self, sort_order, sort_by);
-#line 890 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = action;
-#line 890 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = value;
 #line 890 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 6541 "MediaPage.c"
+	media_page_set_config_photos_sort (self, sort_order, sort_by);
+#line 6475 "MediaPage.c"
 }
 
 
@@ -6546,7 +6480,7 @@ void media_page_on_sort_changed (MediaPage* self, GSimpleAction* action, GVarian
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 883 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_sort_changed (self, action, value);
-#line 6550 "MediaPage.c"
+#line 6484 "MediaPage.c"
 }
 
 
@@ -6555,7 +6489,7 @@ void media_page_on_raw_developer_shotwell (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 894 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_developer_changed (self, RAW_DEVELOPER_SHOTWELL);
-#line 6559 "MediaPage.c"
+#line 6493 "MediaPage.c"
 }
 
 
@@ -6564,7 +6498,7 @@ void media_page_on_raw_developer_camera (MediaPage* self) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_developer_changed (self, RAW_DEVELOPER_CAMERA);
-#line 6568 "MediaPage.c"
+#line 6502 "MediaPage.c"
 }
 
 
@@ -6578,7 +6512,7 @@ static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction*
 	static GQuark _tmp3_label0 = 0;
 #line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp3_label1 = 0;
-#line 6582 "MediaPage.c"
+#line 6516 "MediaPage.c"
 	RawDeveloper _tmp5_ = 0;
 	GSimpleAction* _tmp6_ = NULL;
 	GVariant* _tmp7_ = NULL;
@@ -6600,38 +6534,38 @@ static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction*
 	if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) {
 #line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6604 "MediaPage.c"
+#line 6538 "MediaPage.c"
 			default:
 			{
 #line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				developer = RAW_DEVELOPER_SHOTWELL;
 #line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6611 "MediaPage.c"
+#line 6545 "MediaPage.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) {
 #line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6617 "MediaPage.c"
+#line 6551 "MediaPage.c"
 			default:
 			{
 #line 910 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				developer = RAW_DEVELOPER_CAMERA;
 #line 911 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6624 "MediaPage.c"
+#line 6558 "MediaPage.c"
 			}
 		}
 	} else {
 #line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6630 "MediaPage.c"
+#line 6564 "MediaPage.c"
 			default:
 			{
 #line 913 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6635 "MediaPage.c"
+#line 6569 "MediaPage.c"
 			}
 		}
 	}
@@ -6645,7 +6579,7 @@ static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction*
 	_tmp7_ = value;
 #line 918 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp6_, _tmp7_);
-#line 6649 "MediaPage.c"
+#line 6583 "MediaPage.c"
 }
 
 
@@ -6673,7 +6607,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 	if (_tmp3_) {
 #line 923 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6677 "MediaPage.c"
+#line 6611 "MediaPage.c"
 	}
 #line 928 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	need_warn = FALSE;
@@ -6681,7 +6615,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 	_tmp4_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 #line 931 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	to_set = _tmp4_;
-#line 6685 "MediaPage.c"
+#line 6619 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -6717,7 +6651,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 		_view_index = -1;
 #line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 6721 "MediaPage.c"
+#line 6655 "MediaPage.c"
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
 			gint _tmp14_ = 0;
@@ -6743,7 +6677,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 			if (!(_tmp13_ < _tmp14_)) {
 #line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6747 "MediaPage.c"
+#line 6681 "MediaPage.c"
 			}
 #line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _view_list;
@@ -6763,7 +6697,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 			if (_tmp20_ == NULL) {
 #line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_tmp19_);
-#line 6767 "MediaPage.c"
+#line 6701 "MediaPage.c"
 			}
 #line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			p = _tmp20_;
@@ -6771,7 +6705,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 			_tmp22_ = p;
 #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp22_ != NULL) {
-#line 6775 "MediaPage.c"
+#line 6709 "MediaPage.c"
 				RawDeveloper _tmp23_ = 0;
 				Photo* _tmp24_ = NULL;
 				RawDeveloper _tmp25_ = 0;
@@ -6786,15 +6720,15 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 				_tmp26_ = raw_developer_is_equivalent (_tmp23_, _tmp25_);
 #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp21_ = !_tmp26_;
-#line 6790 "MediaPage.c"
+#line 6724 "MediaPage.c"
 			} else {
 #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp21_ = FALSE;
-#line 6794 "MediaPage.c"
+#line 6728 "MediaPage.c"
 			}
 #line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp21_) {
-#line 6798 "MediaPage.c"
+#line 6732 "MediaPage.c"
 				GeeArrayList* _tmp27_ = NULL;
 				DataView* _tmp28_ = NULL;
 				Photo* _tmp29_ = NULL;
@@ -6813,18 +6747,18 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 				if (_tmp30_) {
 #line 938 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					need_warn = TRUE;
-#line 6817 "MediaPage.c"
+#line 6751 "MediaPage.c"
 				}
 			}
 #line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (p);
 #line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 6824 "MediaPage.c"
+#line 6758 "MediaPage.c"
 		}
 #line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 6828 "MediaPage.c"
+#line 6762 "MediaPage.c"
 	}
 #line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp32_ = need_warn;
@@ -6832,7 +6766,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 	if (!_tmp32_) {
 #line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp31_ = TRUE;
-#line 6836 "MediaPage.c"
+#line 6770 "MediaPage.c"
 	} else {
 		GeeArrayList* _tmp33_ = NULL;
 		gint _tmp34_ = 0;
@@ -6848,11 +6782,11 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 		_tmp36_ = dialogs_confirm_warn_developer_changed (_tmp35_);
 #line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp31_ = _tmp36_;
-#line 6852 "MediaPage.c"
+#line 6786 "MediaPage.c"
 	}
 #line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp31_) {
-#line 6856 "MediaPage.c"
+#line 6790 "MediaPage.c"
 		SetRawDeveloperCommand* command = NULL;
 		GeeArrayList* _tmp37_ = NULL;
 		RawDeveloper _tmp38_ = 0;
@@ -6882,11 +6816,11 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 		media_page_update_development_menu_item_sensitivity (self);
 #line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (command);
-#line 6886 "MediaPage.c"
+#line 6820 "MediaPage.c"
 	}
 #line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (to_set);
-#line 6890 "MediaPage.c"
+#line 6824 "MediaPage.c"
 }
 
 
@@ -6895,7 +6829,7 @@ void media_page_developer_changed (MediaPage* self, RawDeveloper rd) {
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 6899 "MediaPage.c"
+#line 6833 "MediaPage.c"
 }
 
 
@@ -6913,7 +6847,7 @@ static void media_page_real_set_display_titles (CheckerboardPage* base, gboolean
 	_tmp1_ = display;
 #line 954 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
-#line 6917 "MediaPage.c"
+#line 6851 "MediaPage.c"
 }
 
 
@@ -6931,7 +6865,7 @@ static void media_page_real_set_display_comments (CheckerboardPage* base, gboole
 	_tmp1_ = display;
 #line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment", _tmp1_);
-#line 6935 "MediaPage.c"
+#line 6869 "MediaPage.c"
 }
 
 
@@ -6951,7 +6885,7 @@ static GAction* media_page_sort_by_title_action (MediaPage* self) {
 	result = action;
 #line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6955 "MediaPage.c"
+#line 6889 "MediaPage.c"
 }
 
 
@@ -6971,7 +6905,7 @@ static GAction* media_page_sort_ascending_action (MediaPage* self) {
 	result = action;
 #line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6975 "MediaPage.c"
+#line 6909 "MediaPage.c"
 }
 
 
@@ -7008,14 +6942,14 @@ gint media_page_get_menu_sort_by (MediaPage* self) {
 	result = _tmp6_;
 #line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7012 "MediaPage.c"
+#line 6946 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new26 (const gchar* value) {
+static GVariant* _variant_new30 (const gchar* value) {
 #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 7019 "MediaPage.c"
+#line 6953 "MediaPage.c"
 }
 
 
@@ -7024,9 +6958,8 @@ void media_page_set_menu_sort_by (MediaPage* self, gint val) {
 	gint _tmp0_ = 0;
 	gchar* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
+	GAction* _tmp3_ = NULL;
+	GVariant* _tmp4_ = NULL;
 #line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
 #line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -7038,26 +6971,18 @@ void media_page_set_menu_sort_by (MediaPage* self, gint val) {
 #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = media_page_sort_by_title_action (self);
 #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_ == NULL) {
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp2_);
-#line 7047 "MediaPage.c"
-	}
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _variant_new26 (sort);
+	_tmp4_ = _variant_new30 (sort);
 #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp4_, _tmp5_);
+	g_action_change_state (_tmp3_, _tmp4_);
 #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp5_);
+	_g_variant_unref0 (_tmp4_);
 #line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp3_);
 #line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (sort);
-#line 7061 "MediaPage.c"
+#line 6986 "MediaPage.c"
 }
 
 
@@ -7091,14 +7016,14 @@ gboolean media_page_get_menu_sort_order (MediaPage* self) {
 	result = _tmp5_;
 #line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7095 "MediaPage.c"
+#line 7020 "MediaPage.c"
 }
 
 
-static GVariant* _variant_new27 (const gchar* value) {
+static GVariant* _variant_new31 (const gchar* value) {
 #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 7102 "MediaPage.c"
+#line 7027 "MediaPage.c"
 }
 
 
@@ -7106,152 +7031,143 @@ void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending) {
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	GAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
+	GAction* _tmp3_ = NULL;
+	GVariant* _tmp4_ = NULL;
 #line 990 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = ascending;
-#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp1_) {
-#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp0_ = "'ascending'";
-#line 7121 "MediaPage.c"
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp0_ = "ascending";
+#line 7045 "MediaPage.c"
 	} else {
-#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp0_ = "'descending'";
-#line 7125 "MediaPage.c"
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp0_ = "descending";
+#line 7049 "MediaPage.c"
 	}
 #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = media_page_sort_ascending_action (self);
 #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_ == NULL) {
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp2_);
-#line 7135 "MediaPage.c"
-	}
-#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _variant_new27 (_tmp0_);
+	_tmp4_ = _variant_new31 (_tmp0_);
 #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_simple_action_set_state (_tmp4_, _tmp5_);
+	g_action_change_state (_tmp3_, _tmp4_);
 #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_variant_unref0 (_tmp5_);
+	_g_variant_unref0 (_tmp4_);
 #line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp4_);
-#line 7147 "MediaPage.c"
+	_g_object_unref0 (_tmp3_);
+#line 7063 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_title_ascending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_title_ascending_comparator (a, b);
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7156 "MediaPage.c"
+#line 7072 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_title_descending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_title_descending_comparator (a, b);
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7165 "MediaPage.c"
+#line 7081 "MediaPage.c"
 }
 
 
 static gboolean _thumbnail_title_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = thumbnail_title_comparator_predicate (object, alteration);
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7174 "MediaPage.c"
+#line 7090 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_exposure_time_ascending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_exposure_time_ascending_comparator (a, b);
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7183 "MediaPage.c"
+#line 7099 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_exposure_time_desending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_exposure_time_desending_comparator (a, b);
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7192 "MediaPage.c"
+#line 7108 "MediaPage.c"
 }
 
 
 static gboolean _thumbnail_exposure_time_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = thumbnail_exposure_time_comparator_predicate (object, alteration);
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7201 "MediaPage.c"
+#line 7117 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_rating_ascending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_rating_ascending_comparator (a, b);
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7210 "MediaPage.c"
+#line 7126 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_rating_descending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_rating_descending_comparator (a, b);
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7219 "MediaPage.c"
+#line 7135 "MediaPage.c"
 }
 
 
 static gboolean _thumbnail_rating_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = thumbnail_rating_comparator_predicate (object, alteration);
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7228 "MediaPage.c"
+#line 7144 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_filename_ascending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_filename_ascending_comparator (a, b);
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7237 "MediaPage.c"
+#line 7153 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_filename_descending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_filename_descending_comparator (a, b);
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7246 "MediaPage.c"
+#line 7162 "MediaPage.c"
 }
 
 
 static gboolean _thumbnail_filename_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = thumbnail_filename_comparator_predicate (object, alteration);
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7255 "MediaPage.c"
+#line 7171 "MediaPage.c"
 }
 
 
@@ -7269,329 +7185,329 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 	void* _tmp10__target = NULL;
 	ComparatorPredicate _tmp11_ = NULL;
 	void* _tmp11__target = NULL;
-#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = sort_by;
-#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	switch (_tmp0_) {
-#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_TITLE:
-#line 7281 "MediaPage.c"
+#line 7197 "MediaPage.c"
 		{
 			gboolean _tmp1_ = FALSE;
-#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp1_ = ascending;
-#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp1_) {
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_title_ascending_comparator_comparator;
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7302 "MediaPage.c"
+#line 7218 "MediaPage.c"
 			} else {
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_title_descending_comparator_comparator;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7318 "MediaPage.c"
+#line 7234 "MediaPage.c"
 			}
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_title_comparator_predicate_comparator_predicate;
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7336 "MediaPage.c"
+#line 7252 "MediaPage.c"
 		}
-#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_EXPOSURE_DATE:
-#line 7340 "MediaPage.c"
+#line 7256 "MediaPage.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp2_ = ascending;
-#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp2_) {
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_exposure_time_ascending_comparator_comparator;
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7361 "MediaPage.c"
+#line 7277 "MediaPage.c"
 			} else {
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_exposure_time_desending_comparator_comparator;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7377 "MediaPage.c"
+#line 7293 "MediaPage.c"
 			}
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_exposure_time_comparator_predicate_comparator_predicate;
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7395 "MediaPage.c"
+#line 7311 "MediaPage.c"
 		}
-#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_RATING:
-#line 7399 "MediaPage.c"
+#line 7315 "MediaPage.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp3_ = ascending;
-#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp3_) {
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_rating_ascending_comparator_comparator;
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7420 "MediaPage.c"
+#line 7336 "MediaPage.c"
 			} else {
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_rating_descending_comparator_comparator;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7436 "MediaPage.c"
+#line 7352 "MediaPage.c"
 			}
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_rating_comparator_predicate_comparator_predicate;
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7454 "MediaPage.c"
+#line 7370 "MediaPage.c"
 		}
-#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_FILENAME:
-#line 7458 "MediaPage.c"
+#line 7374 "MediaPage.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp4_ = ascending;
-#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp4_) {
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_filename_ascending_comparator_comparator;
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7479 "MediaPage.c"
+#line 7395 "MediaPage.c"
 			} else {
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_filename_descending_comparator_comparator;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7495 "MediaPage.c"
+#line 7411 "MediaPage.c"
 			}
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_filename_comparator_predicate_comparator_predicate;
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7513 "MediaPage.c"
+#line 7429 "MediaPage.c"
 		}
 		default:
 		{
 			gint _tmp5_ = 0;
 			gchar* _tmp6_ = NULL;
 			gchar* _tmp7_ = NULL;
-#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp5_ = media_page_get_menu_sort_by (self);
-#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp6_ = g_strdup_printf ("%i", _tmp5_);
-#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _tmp6_;
-#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			g_debug ("MediaPage.vala:1029: Unknown sort criteria: %s", _tmp7_);
-#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala"
+			g_debug ("MediaPage.vala:1028: Unknown sort criteria: %s", _tmp7_);
+#line 1028 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_free0 (_tmp7_);
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target_destroy_notify = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator = _thumbnail_title_descending_comparator_comparator;
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target_destroy_notify = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_title_comparator_predicate_comparator_predicate;
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7560 "MediaPage.c"
+#line 7476 "MediaPage.c"
 		}
 	}
-#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = comparator;
-#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10__target = comparator_target;
-#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = predicate;
-#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11__target = predicate_target;
-#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), _tmp10_, _tmp10__target, _tmp11_, _tmp11__target);
-#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp9_);
-#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	predicate = NULL;
-#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	predicate_target = NULL;
-#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	predicate_target_destroy_notify = NULL;
-#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator = NULL;
-#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator_target = NULL;
-#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator_target_destroy_notify = NULL;
-#line 7595 "MediaPage.c"
+#line 7511 "MediaPage.c"
 }
 
 
@@ -7600,106 +7516,106 @@ void media_page_sync_sort (MediaPage* self) {
 	gint sort_by = 0;
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_ = 0;
-#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1037 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1054 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_get_config_photos_sort (self, &_tmp0_, &_tmp1_);
-#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1054 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_ascending = _tmp0_;
-#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1054 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_by = _tmp1_;
-#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1056 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_menu_sort_by (self, sort_by);
-#line 1058 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_menu_sort_order (self, sort_ascending);
-#line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_view_comparator (self, sort_by, sort_ascending);
-#line 7618 "MediaPage.c"
+#line 7534 "MediaPage.c"
 }
 
 
 static void media_page_real_destroy (GtkWidget* base) {
 	MediaPage * self;
-#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 1064 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_disconnect_slider (self);
-#line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	GTK_WIDGET_CLASS (media_page_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), gtk_widget_get_type (), GtkWidget));
-#line 7630 "MediaPage.c"
+#line 7546 "MediaPage.c"
 }
 
 
 void media_page_increase_zoom_level (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
-#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 7642 "MediaPage.c"
+#line 7558 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_ = NULL;
-#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
-#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_zoom_slider_assembly_increase_step (_tmp1_);
-#line 7648 "MediaPage.c"
+#line 7564 "MediaPage.c"
 	} else {
 		gint new_scale = 0;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1073 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_get_thumb_size (self);
-#line 1073 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = media_page_compute_zoom_scale_increase (_tmp2_);
-#line 1073 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		new_scale = _tmp3_;
-#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1073 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_save_persistent_thumbnail_scale (self);
-#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = new_scale;
-#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp4_);
-#line 7666 "MediaPage.c"
+#line 7582 "MediaPage.c"
 	}
 }
 
 
 void media_page_decrease_zoom_level (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
-#line 1079 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1079 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1079 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 7679 "MediaPage.c"
+#line 7595 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_ = NULL;
-#line 1081 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
-#line 1081 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_zoom_slider_assembly_decrease_step (_tmp1_);
-#line 7685 "MediaPage.c"
+#line 7601 "MediaPage.c"
 	} else {
 		gint new_scale = 0;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_get_thumb_size (self);
-#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = media_page_compute_zoom_scale_decrease (_tmp2_);
-#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		new_scale = _tmp3_;
-#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_save_persistent_thumbnail_scale (self);
-#line 1085 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = new_scale;
-#line 1085 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp4_);
-#line 7703 "MediaPage.c"
+#line 7619 "MediaPage.c"
 	}
 }
 
@@ -7709,28 +7625,28 @@ static DataView* media_page_real_create_thumbnail (MediaPage* self, DataSource*
 	DataSource* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	Thumbnail* _tmp2_ = NULL;
-#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1088 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
-#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = source;
-#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = media_page_get_thumb_size (self);
-#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = thumbnail_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
-#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7725 "MediaPage.c"
+#line 7641 "MediaPage.c"
 }
 
 
 DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source) {
-#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1088 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1088 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return MEDIA_PAGE_GET_CLASS (self)->create_thumbnail (self, source);
-#line 7734 "MediaPage.c"
+#line 7650 "MediaPage.c"
 }
 
 
@@ -7761,104 +7677,104 @@ void media_page_set_thumb_size (MediaPage* self, gint new_scale) {
 	gint _tmp24_ = 0;
 	gint _tmp25_ = 0;
 	gint _tmp26_ = 0;
-#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1094 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = media_page_get_thumb_size (self);
-#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = new_scale;
-#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp1_ == _tmp2_) {
-#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = TRUE;
-#line 7775 "MediaPage.c"
+#line 7691 "MediaPage.c"
 	} else {
 		gboolean _tmp3_ = FALSE;
-#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 7782 "MediaPage.c"
+#line 7698 "MediaPage.c"
 	}
-#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_) {
-#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7788 "MediaPage.c"
+#line 7704 "MediaPage.c"
 	}
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = new_scale;
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = thumbnail_get_MIN_SCALE ();
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = _tmp5_;
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = thumbnail_get_MAX_SCALE ();
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = _tmp7_;
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = CLAMP (_tmp4_, _tmp6_, _tmp8_);
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	new_scale = _tmp9_;
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = _tmp10_;
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = new_scale;
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_layout_set_scale (_tmp11_, _tmp12_);
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp11_);
-#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1102 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1102 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = _tmp13_;
-#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1102 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1102 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = _tmp15_;
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = new_scale;
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_init (&_tmp18_, G_TYPE_INT);
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_set_int (&_tmp18_, _tmp17_);
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SIZE, &_tmp18_, NULL, NULL);
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_IS_VALUE (&_tmp18_) ? (g_value_unset (&_tmp18_), NULL) : NULL;
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = _tmp19_;
-#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = new_scale;
-#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp22_ = thumbnail_get_MAX_SCALE ();
-#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp23_ = _tmp22_;
-#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp21_ < _tmp23_);
-#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp24_ = new_scale;
-#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp25_ = thumbnail_get_MIN_SCALE ();
-#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp26_ = _tmp25_;
-#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp24_ > _tmp26_);
-#line 7862 "MediaPage.c"
+#line 7778 "MediaPage.c"
 }
 
 
@@ -7872,59 +7788,59 @@ gint media_page_get_thumb_size (MediaPage* self) {
 	CheckerboardLayout* _tmp10_ = NULL;
 	gint _tmp11_ = 0;
 	gint _tmp12_ = 0;
-#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1110 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), 0);
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = checkerboard_layout_get_scale (_tmp1_);
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ <= 0;
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 7890 "MediaPage.c"
+#line 7806 "MediaPage.c"
 		CheckerboardLayout* _tmp4_ = NULL;
 		CheckerboardLayout* _tmp5_ = NULL;
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = _tmp4_;
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = _tmp6_;
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = configuration_facade_get_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		checkerboard_layout_set_scale (_tmp5_, _tmp8_);
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp5_);
-#line 7912 "MediaPage.c"
+#line 7828 "MediaPage.c"
 	}
-#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = _tmp9_;
-#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = checkerboard_layout_get_scale (_tmp10_);
-#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp12_;
-#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7928 "MediaPage.c"
+#line 7844 "MediaPage.c"
 }
 
 
@@ -7933,14 +7849,14 @@ static gboolean _media_page_zoom_slider_assembly_on_zoom_out_pressed_gtk_widget_
 	result = media_page_zoom_slider_assembly_on_zoom_out_pressed ((MediaPageZoomSliderAssembly*) self, event);
 #line 144 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7937 "MediaPage.c"
+#line 7853 "MediaPage.c"
 }
 
 
 static void _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 155 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_zoom_slider_assembly_on_slider_changed ((MediaPageZoomSliderAssembly*) self);
-#line 7944 "MediaPage.c"
+#line 7860 "MediaPage.c"
 }
 
 
@@ -7949,7 +7865,7 @@ static gboolean _media_page_zoom_slider_assembly_on_zoom_in_pressed_gtk_widget_b
 	result = media_page_zoom_slider_assembly_on_zoom_in_pressed ((MediaPageZoomSliderAssembly*) self, event);
 #line 168 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7953 "MediaPage.c"
+#line 7869 "MediaPage.c"
 }
 
 
@@ -8131,14 +8047,14 @@ MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType ob
 	_g_object_unref0 (zoom_group);
 #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self;
-#line 8135 "MediaPage.c"
+#line 8051 "MediaPage.c"
 }
 
 
 MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_new (void) {
 #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return media_page_zoom_slider_assembly_construct (MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY);
-#line 8142 "MediaPage.c"
+#line 8058 "MediaPage.c"
 }
 
 
@@ -8179,7 +8095,7 @@ gdouble media_page_zoom_slider_assembly_scale_to_slider (gint value) {
 	result = (gdouble) ((_tmp6_ - _tmp8_) / MEDIA_PAGE_SLIDER_STEPPING);
 #line 179 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 8183 "MediaPage.c"
+#line 8099 "MediaPage.c"
 }
 
 
@@ -8217,7 +8133,7 @@ gint media_page_zoom_slider_assembly_slider_to_scale (gdouble value) {
 	result = res;
 #line 188 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 8221 "MediaPage.c"
+#line 8137 "MediaPage.c"
 }
 
 
@@ -8233,7 +8149,7 @@ static gboolean media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZo
 	result = TRUE;
 #line 193 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 8237 "MediaPage.c"
+#line 8153 "MediaPage.c"
 }
 
 
@@ -8249,7 +8165,7 @@ static gboolean media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoo
 	result = TRUE;
 #line 198 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 8253 "MediaPage.c"
+#line 8169 "MediaPage.c"
 }
 
 
@@ -8258,7 +8174,7 @@ static void media_page_zoom_slider_assembly_on_slider_changed (MediaPageZoomSlid
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 202 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_signal_emit_by_name (self, "zoom-changed");
-#line 8262 "MediaPage.c"
+#line 8178 "MediaPage.c"
 }
 
 
@@ -8279,7 +8195,7 @@ void media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* s
 	_tmp3_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp2_);
 #line 206 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp3_);
-#line 8283 "MediaPage.c"
+#line 8199 "MediaPage.c"
 }
 
 
@@ -8300,7 +8216,7 @@ void media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* s
 	_tmp3_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp2_);
 #line 210 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp3_);
-#line 8304 "MediaPage.c"
+#line 8220 "MediaPage.c"
 }
 
 
@@ -8329,7 +8245,7 @@ void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly*
 	if (_tmp2_ == _tmp3_) {
 #line 217 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8333 "MediaPage.c"
+#line 8249 "MediaPage.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = self->priv->slider;
@@ -8339,7 +8255,7 @@ void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly*
 	_tmp6_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp5_);
 #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), _tmp6_);
-#line 8343 "MediaPage.c"
+#line 8259 "MediaPage.c"
 }
 
 
@@ -8368,7 +8284,7 @@ void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly*
 	if (_tmp2_ == _tmp3_) {
 #line 226 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8372 "MediaPage.c"
+#line 8288 "MediaPage.c"
 	}
 #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = self->priv->slider;
@@ -8378,7 +8294,7 @@ void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly*
 	_tmp6_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp5_);
 #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), _tmp6_);
-#line 8382 "MediaPage.c"
+#line 8298 "MediaPage.c"
 }
 
 
@@ -8399,7 +8315,7 @@ gint media_page_zoom_slider_assembly_get_scale (MediaPageZoomSliderAssembly* sel
 	result = _tmp2_;
 #line 232 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 8403 "MediaPage.c"
+#line 8319 "MediaPage.c"
 }
 
 
@@ -8419,7 +8335,7 @@ void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* sel
 	if (_tmp0_ == _tmp1_) {
 #line 237 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8423 "MediaPage.c"
+#line 8339 "MediaPage.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = self->priv->slider;
@@ -8429,7 +8345,7 @@ void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* sel
 	_tmp4_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp3_);
 #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), _tmp4_);
-#line 8433 "MediaPage.c"
+#line 8349 "MediaPage.c"
 }
 
 
@@ -8442,14 +8358,14 @@ static void media_page_zoom_slider_assembly_class_init (MediaPageZoomSliderAssem
 	G_OBJECT_CLASS (klass)->finalize = media_page_zoom_slider_assembly_finalize;
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_signal_new ("zoom_changed", MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 8446 "MediaPage.c"
+#line 8362 "MediaPage.c"
 }
 
 
 static void media_page_zoom_slider_assembly_instance_init (MediaPageZoomSliderAssembly * self) {
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv = MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_GET_PRIVATE (self);
-#line 8453 "MediaPage.c"
+#line 8369 "MediaPage.c"
 }
 
 
@@ -8463,7 +8379,7 @@ static void media_page_zoom_slider_assembly_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->adjustment);
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (media_page_zoom_slider_assembly_parent_class)->finalize (obj);
-#line 8467 "MediaPage.c"
+#line 8383 "MediaPage.c"
 }
 
 
@@ -8562,7 +8478,7 @@ static void media_page_class_init (MediaPageClass * klass) {
 	((MediaPageClass *) klass)->create_thumbnail = media_page_real_create_thumbnail;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_page_finalize;
-#line 8566 "MediaPage.c"
+#line 8482 "MediaPage.c"
 }
 
 
@@ -8573,7 +8489,7 @@ static void media_page_instance_init (MediaPage * self) {
 	self->priv->connected_slider = NULL;
 #line 244 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->dnd_handler = NULL;
-#line 8577 "MediaPage.c"
+#line 8493 "MediaPage.c"
 }
 
 
@@ -8589,7 +8505,7 @@ static void media_page_finalize (GObject* obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (media_page_parent_class)->finalize (obj);
-#line 8593 "MediaPage.c"
+#line 8509 "MediaPage.c"
 }
 
 
diff --git a/src/MediaPage.vala b/src/MediaPage.vala
index c9b23b8..ee5ef0e 100644
--- a/src/MediaPage.vala
+++ b/src/MediaPage.vala
@@ -329,15 +329,15 @@ public abstract class MediaPage : CheckerboardPage {
         get_config_photos_sort(out sort_order, out sort_by);
 
         AppWindow.get_instance ().add_action_entries (entries, this);
-        (get_action ("ViewTitle") as GLib.SimpleAction).set_state (Config.Facade.get_instance ().get_display_photo_titles ());
-        (get_action ("ViewComment") as GLib.SimpleAction).set_state (Config.Facade.get_instance ().get_display_photo_comments ());
-        (get_action ("ViewRatings") as GLib.SimpleAction).set_state (Config.Facade.get_instance ().get_display_photo_ratings ());
-        (get_action ("ViewTags") as GLib.SimpleAction).set_state (Config.Facade.get_instance ().get_display_photo_tags ());
-        (get_action ("SortBy") as GLib.SimpleAction).set_state ("%d".printf (sort_by));
-        (get_action ("Sort") as GLib.SimpleAction).set_state (sort_order ? "'ascending'" : "'descending'");
+        get_action ("ViewTitle").change_state (Config.Facade.get_instance ().get_display_photo_titles ());
+        get_action ("ViewComment").change_state (Config.Facade.get_instance ().get_display_photo_comments ());
+        get_action ("ViewRatings").change_state (Config.Facade.get_instance ().get_display_photo_ratings ());
+        get_action ("ViewTags").change_state (Config.Facade.get_instance ().get_display_photo_tags ());
+        get_action ("SortBy").change_state ("%d".printf (sort_by));
+        get_action ("Sort").change_state (sort_order ? "ascending" : "descending");
+
         var d = Config.Facade.get_instance().get_default_raw_developer();
-        var action = get_action ("RawDeveloper") as GLib.SimpleAction;
-        action.set_state (d == RawDeveloper.SHOTWELL ? "'Shotwell'" : "'Camera'");
+        get_action ("RawDeveloper").change_state (d == RawDeveloper.SHOTWELL ? "Shotwell" : "Camera");
     }
     
     protected override void update_actions(int selected_count, int count) {
@@ -881,13 +881,13 @@ public abstract class MediaPage : CheckerboardPage {
     protected abstract void set_config_photos_sort(bool sort_order, int sort_by);
 
     public virtual void on_sort_changed(GLib.SimpleAction action, Variant? value) {
+        action.set_state (value);
+
         int sort_by = get_menu_sort_by();
         bool sort_order = get_menu_sort_order();
         
         set_view_comparator(sort_by, sort_order);
         set_config_photos_sort(sort_order, sort_by);
-
-        action.set_state (value);
     }
     
     public void on_raw_developer_shotwell() {
@@ -979,7 +979,7 @@ public abstract class MediaPage : CheckerboardPage {
     
     protected void set_menu_sort_by(int val) {
         var sort = "%d".printf (val);
-        (sort_by_title_action() as GLib.SimpleAction).set_state (sort);
+        sort_by_title_action().change_state (sort);
     }
     
     protected bool get_menu_sort_order() {
@@ -988,8 +988,7 @@ public abstract class MediaPage : CheckerboardPage {
     }
     
     protected void set_menu_sort_order(bool ascending) {
-        (sort_ascending_action() as GLib.SimpleAction).set_state (
-            ascending ? "'ascending'" : "'descending'");
+        sort_ascending_action().change_state (ascending ? "ascending" : "descending");
     }
     
     void set_view_comparator(int sort_by, bool ascending) {
diff --git a/src/MediaViewTracker.c b/src/MediaViewTracker.c
index 8fb3d67..3187c83 100644
--- a/src/MediaViewTracker.c
+++ b/src/MediaViewTracker.c
@@ -1,4 +1,4 @@
-/* MediaViewTracker.c generated by valac 0.34.2, the Vala compiler
+/* MediaViewTracker.c generated by valac 0.32.1, 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 259175f..eff07e9 100644
--- a/src/MetadataWriter.c
+++ b/src/MetadataWriter.c
@@ -1,4 +1,4 @@
-/* MetadataWriter.c generated by valac 0.34.2, the Vala compiler
+/* MetadataWriter.c generated by valac 0.32.1, the Vala compiler
  * generated from MetadataWriter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2958,7 +2958,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 #line 538 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						_g_object_unref0 (_photo_it);
 #line 2961 "MetadataWriter.c"
-						goto __catch551_g_error;
+						goto __catch549_g_error;
 					}
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_g_object_unref0 (photo);
@@ -2978,8 +2978,8 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			transaction_controller_commit (_tmp23_);
 #line 2980 "MetadataWriter.c"
 		}
-		goto __finally551;
-		__catch551_g_error:
+		goto __finally549;
+		__catch549_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp24_ = NULL;
@@ -3013,7 +3013,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			_g_error_free0 (err);
 #line 3015 "MetadataWriter.c"
 		}
-		__finally551:
+		__finally549:
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3796,7 +3796,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3799 "MetadataWriter.c"
-						goto __catch552_database_error;
+						goto __catch550_database_error;
 					}
 					{
 						LibraryPhoto* _tmp67_ = NULL;
@@ -3853,7 +3853,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3856 "MetadataWriter.c"
-						goto __catch552_database_error;
+						goto __catch550_database_error;
 					}
 					{
 						LibraryPhoto* _tmp76_ = NULL;
@@ -3885,8 +3885,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 				}
 			}
 		}
-		goto __finally552;
-		__catch552_database_error:
+		goto __finally550;
+		__catch550_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp79_ = NULL;
@@ -3902,7 +3902,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 			_g_error_free0 (err);
 #line 3904 "MetadataWriter.c"
 		}
-		__finally552:
+		__finally550:
 		{
 			LibraryPhoto* _tmp80_ = NULL;
 			MetadataWriterCommitJob* _tmp81_ = NULL;
@@ -3949,7 +3949,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3952 "MetadataWriter.c"
-				goto __catch553_database_error;
+				goto __catch551_database_error;
 			}
 #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_background_job_unref0 (job);
@@ -3962,8 +3962,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 3963 "MetadataWriter.c"
 		}
 	}
-	goto __finally553;
-	__catch553_database_error:
+	goto __finally551;
+	__catch551_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp85_ = NULL;
@@ -3979,7 +3979,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 		_g_error_free0 (err);
 #line 3981 "MetadataWriter.c"
 	}
-	__finally553:
+	__finally551:
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4157,18 +4157,18 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) {
 #line 38 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4160 "MetadataWriter.c"
-			goto __catch554_g_error;
+			goto __catch552_g_error;
 		}
 #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_commit_job_commit_editable (self, &_inner_error_);
 #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4167 "MetadataWriter.c"
-			goto __catch554_g_error;
+			goto __catch552_g_error;
 		}
 	}
-	goto __finally554;
-	__catch554_g_error:
+	goto __finally552;
+	__catch552_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp0_ = NULL;
@@ -4189,7 +4189,7 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 4191 "MetadataWriter.c"
 	}
-	__finally554:
+	__finally552:
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4291,10 +4291,10 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s
 #line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4294 "MetadataWriter.c"
-				goto __finally555;
+				goto __finally553;
 			}
 		}
-		__finally555:
+		__finally553:
 		{
 			LibraryPhoto* _tmp16_ = NULL;
 			GFile* _tmp17_ = NULL;
@@ -4433,10 +4433,10 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob*
 #line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4436 "MetadataWriter.c"
-				goto __finally556;
+				goto __finally554;
 			}
 		}
-		__finally556:
+		__finally554:
 		{
 			LibraryPhoto* _tmp18_ = NULL;
 			GFile* _tmp19_ = NULL;
diff --git a/src/NaturalCollate.c b/src/NaturalCollate.c
index b13971c..35b129c 100644
--- a/src/NaturalCollate.c
+++ b/src/NaturalCollate.c
@@ -1,4 +1,4 @@
-/* NaturalCollate.c generated by valac 0.34.2, the Vala compiler
+/* NaturalCollate.c generated by valac 0.32.1, the Vala compiler
  * generated from NaturalCollate.vala, do not modify */
 
 
@@ -27,15 +27,15 @@ static gunichar string_get_char (const gchar* self, glong index) {
 	gunichar result = 0U;
 	glong _tmp0_ = 0L;
 	gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1116 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 41 "NaturalCollate.c"
 }
@@ -45,15 +45,15 @@ static gint string_index_of_nth_char (const gchar* self, glong c) {
 	gint result = 0;
 	glong _tmp0_ = 0L;
 	gchar* _tmp1_ = NULL;
-#line 1136 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1136 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1137 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = c;
-#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1137 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_offset_to_pointer (self, _tmp0_);
-#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1137 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = (gint) (_tmp1_ - ((gchar*) self));
-#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1137 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 59 "NaturalCollate.c"
 }
@@ -66,37 +66,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 82 "NaturalCollate.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 90 "NaturalCollate.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 102 "NaturalCollate.c"
 	}
@@ -116,112 +116,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 126 "NaturalCollate.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 132 "NaturalCollate.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 136 "NaturalCollate.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 140 "NaturalCollate.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 152 "NaturalCollate.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 162 "NaturalCollate.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 168 "NaturalCollate.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 182 "NaturalCollate.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 192 "NaturalCollate.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 198 "NaturalCollate.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 207 "NaturalCollate.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 227 "NaturalCollate.c"
 }
@@ -389,17 +389,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 405 "NaturalCollate.c"
 }
@@ -410,17 +410,17 @@ static gchar* g_unichar_to_string (gunichar self) {
 	gchar* str = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 941 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 941 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 7);
-#line 941 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 941 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	str = (gchar*) _tmp0_;
-#line 942 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 942 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = str;
-#line 942 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 942 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_unichar_to_utf8 (self, _tmp1_);
-#line 943 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 943 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = str;
-#line 943 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 943 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 426 "NaturalCollate.c"
 }
diff --git a/src/Orientation.c b/src/Orientation.c
index 1ff247c..3e2da2a 100644
--- a/src/Orientation.c
+++ b/src/Orientation.c
@@ -1,4 +1,4 @@
-/* Orientation.c generated by valac 0.34.2, the Vala compiler
+/* Orientation.c generated by valac 0.32.1, 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 dc32295..1f4e67d 100644
--- a/src/Page.c
+++ b/src/Page.c
@@ -1,4 +1,4 @@
-/* Page.c generated by valac 0.34.2, the Vala compiler
+/* Page.c generated by valac 0.32.1, the Vala compiler
  * generated from Page.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1005,7 +1005,7 @@ gboolean page_get_alt_pressed (Page* self);
 gboolean page_get_shift_pressed (Page* self);
 gboolean page_get_super_pressed (Page* self);
 void page_set_action_active (Page* self, const gchar* name, gboolean active);
-static GVariant* _variant_new16 (gboolean value);
+static GVariant* _variant_new20 (gboolean value);
 static gboolean page_get_modifiers (Page* self, gboolean* ctrl, gboolean* alt, gboolean* shift, gboolean* super);
 gboolean page_on_ctrl_released (Page* self, GdkEventKey* event);
 gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event);
@@ -1028,8 +1028,8 @@ CommandManager* app_window_get_command_manager (void);
 void page_add_actions (Page* self);
 static void page_real_add_actions (Page* self);
 void page_on_action_toggle (Page* self, GAction* action, GVariant* value);
-static gboolean _variant_get17 (GVariant* value);
-static GVariant* _variant_new18 (gboolean value);
+static gboolean _variant_get21 (GVariant* value);
+static GVariant* _variant_new22 (gboolean value);
 void page_on_action_radio (Page* self, GAction* action, GVariant* value);
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
 static void page_init_load_ui (Page* self, const gchar* ui_filename);
@@ -1153,6 +1153,7 @@ void page_set_page_cursor (Page* self, GdkCursorType cursor_type);
 static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type);
 static gboolean page_on_hide_cursor (Page* self);
 static gboolean _page_on_hide_cursor_gsource_func (gpointer self);
+void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const gchar* new_label);
 static void page_finalize (GObject* obj);
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
 GType thumbnail_view_get_type (void) G_GNUC_CONST;
@@ -1503,14 +1504,14 @@ InjectionGroup* injection_group_construct (GType object_type, const gchar* path)
 	self->priv->path = _tmp1_;
 #line 31 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 1507 "Page.c"
+#line 1508 "Page.c"
 }
 
 
 InjectionGroup* injection_group_new (const gchar* path) {
 #line 31 "/home/jens/Source/shotwell/src/Page.vala"
 	return injection_group_construct (TYPE_INJECTION_GROUP, path);
-#line 1514 "Page.c"
+#line 1515 "Page.c"
 }
 
 
@@ -1528,14 +1529,14 @@ gchar* injection_group_get_path (InjectionGroup* self) {
 	result = _tmp1_;
 #line 36 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 1532 "Page.c"
+#line 1533 "Page.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1539 "Page.c"
+#line 1540 "Page.c"
 }
 
 
@@ -1553,7 +1554,7 @@ GeeList* injection_group_get_elements (InjectionGroup* self) {
 	result = _tmp1_;
 #line 40 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 1557 "Page.c"
+#line 1558 "Page.c"
 }
 
 
@@ -1568,23 +1569,23 @@ void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, con
 	g_return_if_fail (IS_INJECTION_GROUP (self));
 #line 43 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 44 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->elements;
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 44 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = name;
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 44 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 44 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = accellerator;
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 44 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = injection_group_element_new (_tmp1_, _tmp2_, _tmp3_, INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM);
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 44 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 44 "/home/jens/Source/shotwell/src/Page.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_);
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 44 "/home/jens/Source/shotwell/src/Page.vala"
 	_injection_group_element_unref0 (_tmp5_);
-#line 1588 "Page.c"
+#line 1589 "Page.c"
 }
 
 
@@ -1594,25 +1595,25 @@ void injection_group_add_menu (InjectionGroup* self, const gchar* name, const gc
 	const gchar* _tmp2_ = NULL;
 	InjectionGroupElement* _tmp3_ = NULL;
 	InjectionGroupElement* _tmp4_ = NULL;
-#line 48 "/home/jens/Source/shotwell/src/Page.vala"
+#line 47 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_INJECTION_GROUP (self));
-#line 48 "/home/jens/Source/shotwell/src/Page.vala"
+#line 47 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 48 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->elements;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 48 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = name;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 48 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 48 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = injection_group_element_new (_tmp1_, _tmp2_, NULL, INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENU);
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 48 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 48 "/home/jens/Source/shotwell/src/Page.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 48 "/home/jens/Source/shotwell/src/Page.vala"
 	_injection_group_element_unref0 (_tmp4_);
-#line 1616 "Page.c"
+#line 1617 "Page.c"
 }
 
 
@@ -1623,29 +1624,29 @@ void injection_group_add_separator (InjectionGroup* self) {
 	gchar* _tmp3_ = NULL;
 	InjectionGroupElement* _tmp4_ = NULL;
 	InjectionGroupElement* _tmp5_ = NULL;
-#line 52 "/home/jens/Source/shotwell/src/Page.vala"
+#line 51 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_INJECTION_GROUP (self));
-#line 53 "/home/jens/Source/shotwell/src/Page.vala"
+#line 52 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->elements;
-#line 53 "/home/jens/Source/shotwell/src/Page.vala"
+#line 52 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->separator_id;
-#line 53 "/home/jens/Source/shotwell/src/Page.vala"
+#line 52 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->separator_id = _tmp1_ + 1;
-#line 53 "/home/jens/Source/shotwell/src/Page.vala"
+#line 52 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = g_strdup_printf ("%d-separator", _tmp1_);
-#line 53 "/home/jens/Source/shotwell/src/Page.vala"
+#line 52 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 53 "/home/jens/Source/shotwell/src/Page.vala"
+#line 52 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = injection_group_element_new (_tmp3_, NULL, NULL, INJECTION_GROUP_ELEMENT_ITEM_TYPE_SEPARATOR);
-#line 53 "/home/jens/Source/shotwell/src/Page.vala"
+#line 52 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 53 "/home/jens/Source/shotwell/src/Page.vala"
+#line 52 "/home/jens/Source/shotwell/src/Page.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_);
-#line 53 "/home/jens/Source/shotwell/src/Page.vala"
+#line 52 "/home/jens/Source/shotwell/src/Page.vala"
 	_injection_group_element_unref0 (_tmp5_);
-#line 53 "/home/jens/Source/shotwell/src/Page.vala"
+#line 52 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp3_);
-#line 1649 "Page.c"
+#line 1650 "Page.c"
 }
 
 
@@ -1687,20 +1688,20 @@ InjectionGroupElement* injection_group_element_construct (GType object_type, con
 	_tmp3_ = action;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 1691 "Page.c"
+#line 1692 "Page.c"
 		const gchar* _tmp4_ = NULL;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp4_;
-#line 1697 "Page.c"
+#line 1698 "Page.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = name;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp5_;
-#line 1704 "Page.c"
+#line 1705 "Page.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = g_strdup (_tmp2_);
@@ -1722,21 +1723,21 @@ InjectionGroupElement* injection_group_element_construct (GType object_type, con
 	self->kind = _tmp9_;
 #line 19 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 1726 "Page.c"
+#line 1727 "Page.c"
 }
 
 
 InjectionGroupElement* injection_group_element_new (const gchar* name, const gchar* action, const gchar* accellerator, InjectionGroupElementItemType kind) {
 #line 19 "/home/jens/Source/shotwell/src/Page.vala"
 	return injection_group_element_construct (INJECTION_GROUP_TYPE_ELEMENT, name, action, accellerator, kind);
-#line 1733 "Page.c"
+#line 1734 "Page.c"
 }
 
 
 static void injection_group_value_element_init (GValue* value) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	value->data[0].v_pointer = NULL;
-#line 1740 "Page.c"
+#line 1741 "Page.c"
 }
 
 
@@ -1745,7 +1746,7 @@ static void injection_group_value_element_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_element_unref (value->data[0].v_pointer);
-#line 1749 "Page.c"
+#line 1750 "Page.c"
 	}
 }
 
@@ -1755,11 +1756,11 @@ static void injection_group_value_element_copy_value (const GValue* src_value, G
 	if (src_value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = injection_group_element_ref (src_value->data[0].v_pointer);
-#line 1759 "Page.c"
+#line 1760 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1763 "Page.c"
+#line 1764 "Page.c"
 	}
 }
 
@@ -1767,37 +1768,37 @@ static void injection_group_value_element_copy_value (const GValue* src_value, G
 static gpointer injection_group_value_element_peek_pointer (const GValue* value) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 1771 "Page.c"
+#line 1772 "Page.c"
 }
 
 
 static gchar* injection_group_value_element_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	if (collect_values[0].v_pointer) {
-#line 1778 "Page.c"
+#line 1779 "Page.c"
 		InjectionGroupElement* object;
 		object = collect_values[0].v_pointer;
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1785 "Page.c"
+#line 1786 "Page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1789 "Page.c"
+#line 1790 "Page.c"
 		}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = injection_group_element_ref (object);
-#line 1793 "Page.c"
+#line 1794 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 1797 "Page.c"
+#line 1798 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 1801 "Page.c"
+#line 1802 "Page.c"
 }
 
 
@@ -1808,25 +1809,25 @@ static gchar* injection_group_value_element_lcopy_value (const GValue* value, gu
 	if (!object_p) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1812 "Page.c"
+#line 1813 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = NULL;
-#line 1818 "Page.c"
+#line 1819 "Page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1822 "Page.c"
+#line 1823 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = injection_group_element_ref (value->data[0].v_pointer);
-#line 1826 "Page.c"
+#line 1827 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 1830 "Page.c"
+#line 1831 "Page.c"
 }
 
 
@@ -1840,7 +1841,7 @@ GParamSpec* injection_group_param_spec_element (const gchar* name, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return G_PARAM_SPEC (spec);
-#line 1844 "Page.c"
+#line 1845 "Page.c"
 }
 
 
@@ -1849,7 +1850,7 @@ gpointer injection_group_value_get_element (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, INJECTION_GROUP_TYPE_ELEMENT), NULL);
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 1853 "Page.c"
+#line 1854 "Page.c"
 }
 
 
@@ -1869,17 +1870,17 @@ void injection_group_value_set_element (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_element_ref (value->data[0].v_pointer);
-#line 1873 "Page.c"
+#line 1874 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 1877 "Page.c"
+#line 1878 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_element_unref (old);
-#line 1883 "Page.c"
+#line 1884 "Page.c"
 	}
 }
 
@@ -1898,17 +1899,17 @@ void injection_group_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 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 1902 "Page.c"
+#line 1903 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 1906 "Page.c"
+#line 1907 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_element_unref (old);
-#line 1912 "Page.c"
+#line 1913 "Page.c"
 	}
 }
 
@@ -1918,14 +1919,14 @@ static void injection_group_element_class_init (InjectionGroupElementClass * kla
 	injection_group_element_parent_class = g_type_class_peek_parent (klass);
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	((InjectionGroupElementClass *) klass)->finalize = injection_group_element_finalize;
-#line 1922 "Page.c"
+#line 1923 "Page.c"
 }
 
 
 static void injection_group_element_instance_init (InjectionGroupElement * self) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	self->ref_count = 1;
-#line 1929 "Page.c"
+#line 1930 "Page.c"
 }
 
 
@@ -1941,7 +1942,7 @@ static void injection_group_element_finalize (InjectionGroupElement* obj) {
 	_g_free0 (self->action);
 #line 16 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->accellerator);
-#line 1945 "Page.c"
+#line 1946 "Page.c"
 }
 
 
@@ -1966,7 +1967,7 @@ gpointer injection_group_element_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return instance;
-#line 1970 "Page.c"
+#line 1971 "Page.c"
 }
 
 
@@ -1979,7 +1980,7 @@ void injection_group_element_unref (gpointer instance) {
 		INJECTION_GROUP_ELEMENT_GET_CLASS (self)->finalize (self);
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1983 "Page.c"
+#line 1984 "Page.c"
 	}
 }
 
@@ -1987,7 +1988,7 @@ void injection_group_element_unref (gpointer instance) {
 static void value_injection_group_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	value->data[0].v_pointer = NULL;
-#line 1991 "Page.c"
+#line 1992 "Page.c"
 }
 
 
@@ -1996,7 +1997,7 @@ static void value_injection_group_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_unref (value->data[0].v_pointer);
-#line 2000 "Page.c"
+#line 2001 "Page.c"
 	}
 }
 
@@ -2006,11 +2007,11 @@ static void value_injection_group_copy_value (const GValue* src_value, GValue* d
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = injection_group_ref (src_value->data[0].v_pointer);
-#line 2010 "Page.c"
+#line 2011 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2014 "Page.c"
+#line 2015 "Page.c"
 	}
 }
 
@@ -2018,37 +2019,37 @@ static void value_injection_group_copy_value (const GValue* src_value, GValue* d
 static gpointer value_injection_group_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 2022 "Page.c"
+#line 2023 "Page.c"
 }
 
 
 static gchar* value_injection_group_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	if (collect_values[0].v_pointer) {
-#line 2029 "Page.c"
+#line 2030 "Page.c"
 		InjectionGroup* object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2036 "Page.c"
+#line 2037 "Page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2040 "Page.c"
+#line 2041 "Page.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = injection_group_ref (object);
-#line 2044 "Page.c"
+#line 2045 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 2048 "Page.c"
+#line 2049 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 2052 "Page.c"
+#line 2053 "Page.c"
 }
 
 
@@ -2059,25 +2060,25 @@ static gchar* value_injection_group_lcopy_value (const GValue* value, guint n_co
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2063 "Page.c"
+#line 2064 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = NULL;
-#line 2069 "Page.c"
+#line 2070 "Page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2073 "Page.c"
+#line 2074 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = injection_group_ref (value->data[0].v_pointer);
-#line 2077 "Page.c"
+#line 2078 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 2081 "Page.c"
+#line 2082 "Page.c"
 }
 
 
@@ -2091,7 +2092,7 @@ GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return G_PARAM_SPEC (spec);
-#line 2095 "Page.c"
+#line 2096 "Page.c"
 }
 
 
@@ -2100,7 +2101,7 @@ gpointer value_get_injection_group (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INJECTION_GROUP), NULL);
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 2104 "Page.c"
+#line 2105 "Page.c"
 }
 
 
@@ -2120,17 +2121,17 @@ void value_set_injection_group (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_ref (value->data[0].v_pointer);
-#line 2124 "Page.c"
+#line 2125 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 2128 "Page.c"
+#line 2129 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_unref (old);
-#line 2134 "Page.c"
+#line 2135 "Page.c"
 	}
 }
 
@@ -2149,17 +2150,17 @@ void value_take_injection_group (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 2153 "Page.c"
+#line 2154 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 2157 "Page.c"
+#line 2158 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_unref (old);
-#line 2163 "Page.c"
+#line 2164 "Page.c"
 	}
 }
 
@@ -2171,7 +2172,7 @@ static void injection_group_class_init (InjectionGroupClass * klass) {
 	((InjectionGroupClass *) klass)->finalize = injection_group_finalize;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (InjectionGroupPrivate));
-#line 2175 "Page.c"
+#line 2176 "Page.c"
 }
 
 
@@ -2187,7 +2188,7 @@ static void injection_group_instance_init (InjectionGroup * self) {
 	self->priv->separator_id = 0;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	self->ref_count = 1;
-#line 2191 "Page.c"
+#line 2192 "Page.c"
 }
 
 
@@ -2201,7 +2202,7 @@ static void injection_group_finalize (InjectionGroup* obj) {
 	_g_free0 (self->priv->path);
 #line 28 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->elements);
-#line 2205 "Page.c"
+#line 2206 "Page.c"
 }
 
 
@@ -2226,7 +2227,7 @@ gpointer injection_group_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return instance;
-#line 2230 "Page.c"
+#line 2231 "Page.c"
 }
 
 
@@ -2239,7 +2240,7 @@ void injection_group_unref (gpointer instance) {
 		INJECTION_GROUP_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2243 "Page.c"
+#line 2244 "Page.c"
 	}
 }
 
@@ -2247,16 +2248,16 @@ void injection_group_unref (gpointer instance) {
 static gboolean _page_on_context_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self) {
 	gboolean result;
 	result = page_on_context_keypress ((Page*) self);
-#line 99 "/home/jens/Source/shotwell/src/Page.vala"
+#line 98 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2253 "Page.c"
+#line 2254 "Page.c"
 }
 
 
 static void _page_attach_view_signals_gtk_widget_realize (GtkWidget* _sender, gpointer self) {
-#line 103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 102 "/home/jens/Source/shotwell/src/Page.vala"
 	page_attach_view_signals ((Page*) self);
-#line 2260 "Page.c"
+#line 2261 "Page.c"
 }
 
 
@@ -2269,49 +2270,49 @@ Page* page_construct (GType object_type, const gchar* page_name) {
 	gchar* _tmp4_ = NULL;
 	ViewCollection* _tmp5_ = NULL;
 	GdkPoint _tmp6_ = {0};
-#line 90 "/home/jens/Source/shotwell/src/Page.vala"
+#line 89 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 90 "/home/jens/Source/shotwell/src/Page.vala"
+#line 89 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (Page*) g_object_new (object_type, NULL);
-#line 91 "/home/jens/Source/shotwell/src/Page.vala"
+#line 90 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 91 "/home/jens/Source/shotwell/src/Page.vala"
+#line 90 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 91 "/home/jens/Source/shotwell/src/Page.vala"
+#line 90 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_name);
-#line 91 "/home/jens/Source/shotwell/src/Page.vala"
+#line 90 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_name = _tmp1_;
-#line 93 "/home/jens/Source/shotwell/src/Page.vala"
+#line 92 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_name;
-#line 93 "/home/jens/Source/shotwell/src/Page.vala"
+#line 92 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = g_strdup_printf ("ViewCollection for Page %s", _tmp2_);
-#line 93 "/home/jens/Source/shotwell/src/Page.vala"
+#line 92 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 93 "/home/jens/Source/shotwell/src/Page.vala"
+#line 92 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = view_collection_new (_tmp4_);
-#line 93 "/home/jens/Source/shotwell/src/Page.vala"
+#line 92 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (self->priv->view);
-#line 93 "/home/jens/Source/shotwell/src/Page.vala"
+#line 92 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->view = _tmp5_;
-#line 93 "/home/jens/Source/shotwell/src/Page.vala"
+#line 92 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp4_);
-#line 95 "/home/jens/Source/shotwell/src/Page.vala"
+#line 94 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_.x = -1;
-#line 95 "/home/jens/Source/shotwell/src/Page.vala"
+#line 94 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_.y = -1;
-#line 95 "/home/jens/Source/shotwell/src/Page.vala"
+#line 94 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_down = _tmp6_;
-#line 97 "/home/jens/Source/shotwell/src/Page.vala"
+#line 96 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 99 "/home/jens/Source/shotwell/src/Page.vala"
+#line 98 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "popup-menu", (GCallback) _page_on_context_keypress_gtk_widget_popup_menu, self, 0);
-#line 101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 100 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_ui (self);
-#line 103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 102 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "realize", (GCallback) _page_attach_view_signals_gtk_widget_realize, self, 0);
-#line 90 "/home/jens/Source/shotwell/src/Page.vala"
+#line 89 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 2315 "Page.c"
+#line 2316 "Page.c"
 }
 
 
@@ -2323,63 +2324,63 @@ static void page_real_destroy (GtkWidget* base) {
 	OneShotScheduler* _tmp4_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 113 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE, Page);
-#line 115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 114 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 114 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 115 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 2335 "Page.c"
+#line 2336 "Page.c"
 	}
-#line 119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 118 "/home/jens/Source/shotwell/src/Page.vala"
 	page_detach_event_source (self);
-#line 120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 119 "/home/jens/Source/shotwell/src/Page.vala"
 	page_detach_view_signals (self);
-#line 121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 120 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->view;
-#line 121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 120 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 123 "/home/jens/Source/shotwell/src/Page.vala"
 	page_clear_container (self);
-#line 126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 125 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->toolbar;
-#line 126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 125 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 2351 "Page.c"
+#line 2352 "Page.c"
 		GtkToolbar* _tmp3_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/Page.vala"
+#line 126 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->toolbar;
-#line 127 "/home/jens/Source/shotwell/src/Page.vala"
+#line 126 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 2357 "Page.c"
+#line 2358 "Page.c"
 	}
-#line 130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 129 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->update_actions_scheduler;
-#line 130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 129 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 2363 "Page.c"
+#line 2364 "Page.c"
 		OneShotScheduler* _tmp5_ = NULL;
-#line 131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 130 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->update_actions_scheduler;
-#line 131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 130 "/home/jens/Source/shotwell/src/Page.vala"
 		one_shot_scheduler_cancel (_tmp5_);
-#line 2369 "Page.c"
+#line 2370 "Page.c"
 	}
-#line 133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 132 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->is_destroyed = TRUE;
-#line 135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 134 "/home/jens/Source/shotwell/src/Page.vala"
 	GTK_WIDGET_CLASS (page_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), gtk_widget_get_type (), GtkWidget));
-#line 137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 136 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_page_name (self);
-#line 137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 136 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 137 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:137: Page %s Destroyed", _tmp7_);
-#line 137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 136 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:136: Page %s Destroyed", _tmp7_);
+#line 136 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp7_);
-#line 2383 "Page.c"
+#line 2384 "Page.c"
 }
 
 
@@ -2387,43 +2388,43 @@ gchar* page_get_page_name (Page* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 139 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 140 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page_name;
-#line 141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 140 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 140 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 140 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2401 "Page.c"
+#line 2402 "Page.c"
 }
 
 
 static void page_real_set_page_name (Page* self, const gchar* page_name) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 143 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (page_name != NULL);
-#line 145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 144 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 144 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 144 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_name);
-#line 145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 144 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_name = _tmp1_;
-#line 2418 "Page.c"
+#line 2419 "Page.c"
 }
 
 
 void page_set_page_name (Page* self, const gchar* page_name) {
-#line 144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 143 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 143 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_page_name (self, page_name);
-#line 2427 "Page.c"
+#line 2428 "Page.c"
 }
 
 
@@ -2431,24 +2432,24 @@ gchar* page_to_string (Page* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 148 "/home/jens/Source/shotwell/src/Page.vala"
+#line 147 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 148 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page_name;
-#line 149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 148 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 148 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 148 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2445 "Page.c"
+#line 2446 "Page.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
-#line 153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 152 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 2452 "Page.c"
+#line 2453 "Page.c"
 }
 
 
@@ -2456,17 +2457,17 @@ ViewCollection* page_get_view (Page* self) {
 	ViewCollection* result = NULL;
 	ViewCollection* _tmp0_ = NULL;
 	ViewCollection* _tmp1_ = NULL;
-#line 152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 151 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 152 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->view;
-#line 153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 152 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _data_collection_ref0 (_tmp0_);
-#line 153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 152 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 152 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2470 "Page.c"
+#line 2471 "Page.c"
 }
 
 
@@ -2474,17 +2475,17 @@ GtkWindow* page_get_container (Page* self) {
 	GtkWindow* result = NULL;
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 155 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 156 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->container;
-#line 157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 156 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 156 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 156 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2488 "Page.c"
+#line 2489 "Page.c"
 }
 
 
@@ -2492,100 +2493,100 @@ static void page_real_set_container (Page* self, GtkWindow* container) {
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
 	GtkWindow* _tmp2_ = NULL;
-#line 160 "/home/jens/Source/shotwell/src/Page.vala"
+#line 159 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
-#line 161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 160 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->container;
-#line 161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 160 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_ == NULL, "this.container == null");
-#line 163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 162 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = container;
-#line 163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 162 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 162 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->container);
-#line 163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 162 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->container = _tmp2_;
-#line 2510 "Page.c"
+#line 2511 "Page.c"
 }
 
 
 void page_set_container (Page* self, GtkWindow* container) {
-#line 160 "/home/jens/Source/shotwell/src/Page.vala"
+#line 159 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 160 "/home/jens/Source/shotwell/src/Page.vala"
+#line 159 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_container (self, container);
-#line 2519 "Page.c"
+#line 2520 "Page.c"
 }
 
 
 static void page_real_clear_container (Page* self) {
-#line 167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 166 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->container);
-#line 167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 166 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->container = NULL;
-#line 2528 "Page.c"
+#line 2529 "Page.c"
 }
 
 
 void page_clear_container (Page* self) {
-#line 166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 165 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 165 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->clear_container (self);
-#line 2537 "Page.c"
+#line 2538 "Page.c"
 }
 
 
 static gboolean _page_on_button_pressed_internal_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = page_on_button_pressed_internal ((Page*) self, event);
-#line 181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 180 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2546 "Page.c"
+#line 2547 "Page.c"
 }
 
 
 static gboolean _page_on_button_released_internal_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = page_on_button_released_internal ((Page*) self, event);
-#line 182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 181 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2555 "Page.c"
+#line 2556 "Page.c"
 }
 
 
 static gboolean _page_on_motion_internal_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) {
 	gboolean result;
 	result = page_on_motion_internal ((Page*) self, event);
-#line 183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 182 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2564 "Page.c"
+#line 2565 "Page.c"
 }
 
 
 static gboolean _page_on_leave_notify_event_gtk_widget_leave_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self) {
 	gboolean result;
 	result = page_on_leave_notify_event ((Page*) self);
-#line 184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 183 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2573 "Page.c"
+#line 2574 "Page.c"
 }
 
 
 static gboolean _page_on_mousewheel_internal_gtk_widget_scroll_event (GtkWidget* _sender, GdkEventScroll* event, gpointer self) {
 	gboolean result;
 	result = page_on_mousewheel_internal ((Page*) self, event);
-#line 185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 184 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2582 "Page.c"
+#line 2583 "Page.c"
 }
 
 
 static void _page_on_event_source_realize_gtk_widget_realize (GtkWidget* _sender, gpointer self) {
-#line 186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 185 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_event_source_realize ((Page*) self);
-#line 2589 "Page.c"
+#line 2590 "Page.c"
 }
 
 
@@ -2601,55 +2602,55 @@ void page_set_event_source (Page* self, GtkWidget* event_source) {
 	GtkWidget* _tmp8_ = NULL;
 	GtkWidget* _tmp9_ = NULL;
 	GtkWidget* _tmp10_ = NULL;
-#line 170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 169 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 169 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WIDGET (event_source));
-#line 171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 170 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 170 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_ == NULL, "this.event_source == null");
-#line 173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 172 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = event_source;
-#line 173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 172 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 172 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 172 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = _tmp2_;
-#line 174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 173 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event_source;
-#line 174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 173 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_set_can_focus (_tmp3_, TRUE);
-#line 177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 176 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event_source;
-#line 177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 176 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_add_events (_tmp4_, (gint) ((((((GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK) | GDK_POINTER_MOTION_MASK) | GDK_POINTER_MOTION_HINT_MASK) | GDK_BUTTON_MOTION_MASK) | GDK_LEAVE_NOTIFY_MASK) | GDK_SCROLL_MASK));
-#line 181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 180 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event_source;
-#line 181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 180 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp5_, "button-press-event", (GCallback) _page_on_button_pressed_internal_gtk_widget_button_press_event, self, 0);
-#line 182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 181 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = event_source;
-#line 182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 181 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp6_, "button-release-event", (GCallback) _page_on_button_released_internal_gtk_widget_button_release_event, self, 0);
-#line 183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 182 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = event_source;
-#line 183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 182 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp7_, "motion-notify-event", (GCallback) _page_on_motion_internal_gtk_widget_motion_notify_event, self, 0);
-#line 184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 183 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = event_source;
-#line 184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 183 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp8_, "leave-notify-event", (GCallback) _page_on_leave_notify_event_gtk_widget_leave_notify_event, self, 0);
-#line 185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 184 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = event_source;
-#line 185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 184 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp9_, "scroll-event", (GCallback) _page_on_mousewheel_internal_gtk_widget_scroll_event, self, 0);
-#line 186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 185 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = event_source;
-#line 186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 185 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp10_, "realize", (GCallback) _page_on_event_source_realize_gtk_widget_realize, self, 0);
-#line 2653 "Page.c"
+#line 2654 "Page.c"
 }
 
 
@@ -2665,53 +2666,53 @@ static void page_detach_event_source (Page* self) {
 	guint _tmp8_ = 0U;
 	GtkWidget* _tmp9_ = NULL;
 	guint _tmp10_ = 0U;
-#line 189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 188 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 189 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 189 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 190 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 2677 "Page.c"
+#line 2678 "Page.c"
 	}
-#line 193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 192 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 192 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp2_, NULL, FALSE);
-#line 193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 192 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _page_on_button_pressed_internal_gtk_widget_button_press_event, self);
-#line 194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 193 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->event_source;
-#line 194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 193 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("button-release-event", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 193 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _page_on_button_released_internal_gtk_widget_button_release_event, self);
-#line 195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 194 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->event_source;
-#line 195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 194 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("motion-notify-event", gtk_widget_get_type (), &_tmp6_, NULL, FALSE);
-#line 195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 194 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _page_on_motion_internal_gtk_widget_motion_notify_event, self);
-#line 196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 195 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->event_source;
-#line 196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 195 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("leave-notify-event", gtk_widget_get_type (), &_tmp8_, NULL, FALSE);
-#line 196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 195 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _page_on_leave_notify_event_gtk_widget_leave_notify_event, self);
-#line 197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 196 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 196 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("scroll-event", gtk_widget_get_type (), &_tmp10_, NULL, FALSE);
-#line 197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 196 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _page_on_mousewheel_internal_gtk_widget_scroll_event, self);
-#line 199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 198 "/home/jens/Source/shotwell/src/Page.vala"
 	page_disable_drag_source (self);
-#line 201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 200 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 200 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = NULL;
-#line 2715 "Page.c"
+#line 2716 "Page.c"
 }
 
 
@@ -2719,24 +2720,24 @@ GtkWidget* page_get_event_source (Page* self) {
 	GtkWidget* result = NULL;
 	GtkWidget* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 203 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 204 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 204 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 204 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 204 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2733 "Page.c"
+#line 2734 "Page.c"
 }
 
 
 static gpointer _injection_group_ref0 (gpointer self) {
-#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 2740 "Page.c"
+#line 2741 "Page.c"
 }
 
 
@@ -2746,341 +2747,358 @@ GMenuModel* page_get_menubar (Page* self) {
 	GtkBuilder* _tmp0_ = NULL;
 	GObject* _tmp1_ = NULL;
 	GMenu* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-#line 209 "/home/jens/Source/shotwell/src/Page.vala"
+	GMenu* _tmp3_ = NULL;
+	gboolean _tmp5_ = FALSE;
+#line 208 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 209 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->builder;
-#line 210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 209 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "MenuBar");
-#line 210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 209 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_menu_get_type ()) ? ((GMenu*) _tmp1_) : NULL);
-#line 210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 209 "/home/jens/Source/shotwell/src/Page.vala"
 	model = _tmp2_;
-#line 212 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = self->priv->menubar_injected;
-#line 212 "/home/jens/Source/shotwell/src/Page.vala"
-	if (!_tmp3_) {
-#line 2765 "Page.c"
+#line 210 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = model;
+#line 210 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp3_ == NULL) {
+#line 2767 "Page.c"
+		GMenu* _tmp4_ = NULL;
+#line 211 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = g_menu_new ();
+#line 211 "/home/jens/Source/shotwell/src/Page.vala"
+		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_menu_model_get_type (), GMenuModel);
+#line 211 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (model);
+#line 211 "/home/jens/Source/shotwell/src/Page.vala"
+		return result;
+#line 2777 "Page.c"
+	}
+#line 214 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp5_ = self->priv->menubar_injected;
+#line 214 "/home/jens/Source/shotwell/src/Page.vala"
+	if (!_tmp5_) {
+#line 2783 "Page.c"
 		InjectionGroup** injection_groups = NULL;
-		gint _tmp4_ = 0;
-		InjectionGroup** _tmp5_ = NULL;
+		gint _tmp6_ = 0;
+		InjectionGroup** _tmp7_ = NULL;
 		gint injection_groups_length1 = 0;
 		gint _injection_groups_size_ = 0;
-		InjectionGroup** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-#line 214 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp5_ = page_init_collect_injection_groups (self, &_tmp4_);
-#line 214 "/home/jens/Source/shotwell/src/Page.vala"
-		injection_groups = _tmp5_;
-#line 214 "/home/jens/Source/shotwell/src/Page.vala"
-		injection_groups_length1 = _tmp4_;
-#line 214 "/home/jens/Source/shotwell/src/Page.vala"
+		InjectionGroup** _tmp8_ = NULL;
+		gint _tmp8__length1 = 0;
+#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp7_ = page_init_collect_injection_groups (self, &_tmp6_);
+#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+		injection_groups = _tmp7_;
+#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+		injection_groups_length1 = _tmp6_;
+#line 216 "/home/jens/Source/shotwell/src/Page.vala"
 		_injection_groups_size_ = injection_groups_length1;
-#line 215 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp6_ = injection_groups;
-#line 215 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp6__length1 = injection_groups_length1;
-#line 2785 "Page.c"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp8_ = injection_groups;
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp8__length1 = injection_groups_length1;
+#line 2803 "Page.c"
 		{
 			InjectionGroup** group_collection = NULL;
 			gint group_collection_length1 = 0;
 			gint _group_collection_size_ = 0;
 			gint group_it = 0;
-#line 215 "/home/jens/Source/shotwell/src/Page.vala"
-			group_collection = _tmp6_;
-#line 215 "/home/jens/Source/shotwell/src/Page.vala"
-			group_collection_length1 = _tmp6__length1;
-#line 215 "/home/jens/Source/shotwell/src/Page.vala"
-			for (group_it = 0; group_it < _tmp6__length1; group_it = group_it + 1) {
-#line 2797 "Page.c"
-				InjectionGroup* _tmp7_ = NULL;
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+			group_collection = _tmp8_;
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+			group_collection_length1 = _tmp8__length1;
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+			for (group_it = 0; group_it < _tmp8__length1; group_it = group_it + 1) {
+#line 2815 "Page.c"
+				InjectionGroup* _tmp9_ = NULL;
 				InjectionGroup* group = NULL;
-#line 215 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp7_ = _injection_group_ref0 (group_collection[group_it]);
-#line 215 "/home/jens/Source/shotwell/src/Page.vala"
-				group = _tmp7_;
-#line 2804 "Page.c"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp9_ = _injection_group_ref0 (group_collection[group_it]);
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+				group = _tmp9_;
+#line 2822 "Page.c"
 				{
 					gint items = 0;
-					GMenu* _tmp8_ = NULL;
-					gint _tmp9_ = 0;
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
-					_tmp8_ = model;
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
-					_tmp9_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, g_menu_model_get_type (), GMenuModel));
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
-					items = _tmp9_;
-#line 2815 "Page.c"
+					GMenu* _tmp10_ = NULL;
+					gint _tmp11_ = 0;
+#line 218 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp10_ = model;
+#line 218 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp11_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_menu_model_get_type (), GMenuModel));
+#line 218 "/home/jens/Source/shotwell/src/Page.vala"
+					items = _tmp11_;
+#line 2833 "Page.c"
 					{
 						gint i = 0;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 219 "/home/jens/Source/shotwell/src/Page.vala"
 						i = 0;
-#line 2820 "Page.c"
+#line 2838 "Page.c"
 						{
-							gboolean _tmp10_ = FALSE;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
-							_tmp10_ = TRUE;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+							gboolean _tmp12_ = FALSE;
+#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp12_ = TRUE;
+#line 219 "/home/jens/Source/shotwell/src/Page.vala"
 							while (TRUE) {
-#line 2827 "Page.c"
-								gint _tmp12_ = 0;
-								gint _tmp13_ = 0;
-								GMenuModel* submenu = NULL;
-								GMenu* _tmp14_ = NULL;
+#line 2845 "Page.c"
+								gint _tmp14_ = 0;
 								gint _tmp15_ = 0;
-								GMenuModel* _tmp16_ = NULL;
+								GMenuModel* submenu = NULL;
+								GMenu* _tmp16_ = NULL;
+								gint _tmp17_ = 0;
+								GMenuModel* _tmp18_ = NULL;
 								GMenuModel* section = NULL;
-								GMenuModel* _tmp17_ = NULL;
-								InjectionGroup* _tmp18_ = NULL;
-								gchar* _tmp19_ = NULL;
-								gchar* _tmp20_ = NULL;
-								GMenuModel* _tmp21_ = NULL;
-								GMenuModel* _tmp22_ = NULL;
+								GMenuModel* _tmp19_ = NULL;
+								InjectionGroup* _tmp20_ = NULL;
+								gchar* _tmp21_ = NULL;
+								gchar* _tmp22_ = NULL;
 								GMenuModel* _tmp23_ = NULL;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
-								if (!_tmp10_) {
-#line 2844 "Page.c"
-									gint _tmp11_ = 0;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
-									_tmp11_ = i;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
-									i = _tmp11_ + 1;
-#line 2850 "Page.c"
+								GMenuModel* _tmp24_ = NULL;
+								GMenuModel* _tmp25_ = NULL;
+#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+								if (!_tmp12_) {
+#line 2862 "Page.c"
+									gint _tmp13_ = 0;
+#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp13_ = i;
+#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+									i = _tmp13_ + 1;
+#line 2868 "Page.c"
 								}
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
-								_tmp10_ = FALSE;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
-								_tmp12_ = i;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
-								_tmp13_ = items;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
-								if (!(_tmp12_ < _tmp13_)) {
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp12_ = FALSE;
+#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp14_ = i;
+#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp15_ = items;
+#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+								if (!(_tmp14_ < _tmp15_)) {
+#line 219 "/home/jens/Source/shotwell/src/Page.vala"
 									break;
-#line 2862 "Page.c"
+#line 2880 "Page.c"
 								}
-#line 218 "/home/jens/Source/shotwell/src/Page.vala"
-								_tmp14_ = model;
-#line 218 "/home/jens/Source/shotwell/src/Page.vala"
-								_tmp15_ = i;
-#line 218 "/home/jens/Source/shotwell/src/Page.vala"
-								_tmp16_ = g_menu_model_get_item_link (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, g_menu_model_get_type (), GMenuModel), _tmp15_, G_MENU_LINK_SUBMENU);
-#line 218 "/home/jens/Source/shotwell/src/Page.vala"
-								submenu = _tmp16_;
-#line 220 "/home/jens/Source/shotwell/src/Page.vala"
-								_tmp17_ = submenu;
-#line 220 "/home/jens/Source/shotwell/src/Page.vala"
-								_tmp18_ = group;
 #line 220 "/home/jens/Source/shotwell/src/Page.vala"
-								_tmp19_ = injection_group_get_path (_tmp18_);
+								_tmp16_ = model;
 #line 220 "/home/jens/Source/shotwell/src/Page.vala"
-								_tmp20_ = _tmp19_;
+								_tmp17_ = i;
 #line 220 "/home/jens/Source/shotwell/src/Page.vala"
-								_tmp21_ = page_find_extension_point (self, _tmp17_, _tmp20_);
+								_tmp18_ = g_menu_model_get_item_link (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, g_menu_model_get_type (), GMenuModel), _tmp17_, G_MENU_LINK_SUBMENU);
 #line 220 "/home/jens/Source/shotwell/src/Page.vala"
+								submenu = _tmp18_;
+#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp19_ = submenu;
+#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp20_ = group;
+#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp21_ = injection_group_get_path (_tmp20_);
+#line 222 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp22_ = _tmp21_;
-#line 220 "/home/jens/Source/shotwell/src/Page.vala"
-								_g_free0 (_tmp20_);
-#line 220 "/home/jens/Source/shotwell/src/Page.vala"
-								section = _tmp22_;
-#line 223 "/home/jens/Source/shotwell/src/Page.vala"
-								_tmp23_ = section;
-#line 223 "/home/jens/Source/shotwell/src/Page.vala"
-								if (_tmp23_ == NULL) {
-#line 224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp23_ = page_find_extension_point (self, _tmp19_, _tmp22_);
+#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp24_ = _tmp23_;
+#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+								_g_free0 (_tmp22_);
+#line 222 "/home/jens/Source/shotwell/src/Page.vala"
+								section = _tmp24_;
+#line 225 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp25_ = section;
+#line 225 "/home/jens/Source/shotwell/src/Page.vala"
+								if (_tmp25_ == NULL) {
+#line 226 "/home/jens/Source/shotwell/src/Page.vala"
 									_g_object_unref0 (section);
-#line 224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 226 "/home/jens/Source/shotwell/src/Page.vala"
 									_g_object_unref0 (submenu);
-#line 224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 226 "/home/jens/Source/shotwell/src/Page.vala"
 									continue;
-#line 2898 "Page.c"
+#line 2916 "Page.c"
 								}
 								{
 									GeeList* _element_list = NULL;
-									InjectionGroup* _tmp24_ = NULL;
-									GeeList* _tmp25_ = NULL;
+									InjectionGroup* _tmp26_ = NULL;
+									GeeList* _tmp27_ = NULL;
 									gint _element_size = 0;
-									GeeList* _tmp26_ = NULL;
-									gint _tmp27_ = 0;
-									gint _tmp28_ = 0;
+									GeeList* _tmp28_ = NULL;
+									gint _tmp29_ = 0;
+									gint _tmp30_ = 0;
 									gint _element_index = 0;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-									_tmp24_ = group;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-									_tmp25_ = injection_group_get_elements (_tmp24_);
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-									_element_list = _tmp25_;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-									_tmp26_ = _element_list;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-									_tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-									_tmp28_ = _tmp27_;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-									_element_size = _tmp28_;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp26_ = group;
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp27_ = injection_group_get_elements (_tmp26_);
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+									_element_list = _tmp27_;
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp28_ = _element_list;
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp29_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp30_ = _tmp29_;
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+									_element_size = _tmp30_;
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
 									_element_index = -1;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
 									while (TRUE) {
-#line 2927 "Page.c"
-										gint _tmp29_ = 0;
-										gint _tmp30_ = 0;
+#line 2945 "Page.c"
 										gint _tmp31_ = 0;
-										InjectionGroupElement* element = NULL;
-										GeeList* _tmp32_ = NULL;
+										gint _tmp32_ = 0;
 										gint _tmp33_ = 0;
-										gpointer _tmp34_ = NULL;
+										InjectionGroupElement* element = NULL;
+										GeeList* _tmp34_ = NULL;
+										gint _tmp35_ = 0;
+										gpointer _tmp36_ = NULL;
 										GMenu* menu = NULL;
-										GMenuModel* _tmp35_ = NULL;
-										GMenu* _tmp36_ = NULL;
-										InjectionGroupElement* _tmp37_ = NULL;
-										InjectionGroupElementItemType _tmp38_ = 0;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp29_ = _element_index;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-										_element_index = _tmp29_ + 1;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp30_ = _element_index;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp31_ = _element_size;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-										if (!(_tmp30_ < _tmp31_)) {
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+										GMenuModel* _tmp37_ = NULL;
+										GMenu* _tmp38_ = NULL;
+										InjectionGroupElement* _tmp39_ = NULL;
+										InjectionGroupElementItemType _tmp40_ = 0;
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp31_ = _element_index;
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+										_element_index = _tmp31_ + 1;
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp32_ = _element_index;
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp33_ = _element_size;
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+										if (!(_tmp32_ < _tmp33_)) {
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
 											break;
-#line 2952 "Page.c"
+#line 2970 "Page.c"
 										}
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp32_ = _element_list;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp33_ = _element_index;
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp34_ = gee_list_get (_tmp32_, _tmp33_);
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
-										element = (InjectionGroupElement*) _tmp34_;
-#line 228 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp35_ = section;
-#line 228 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, g_menu_get_type ()) ? ((GMenu*) _tmp35_) : NULL);
-#line 228 "/home/jens/Source/shotwell/src/Page.vala"
-										menu = _tmp36_;
 #line 229 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp37_ = element;
+										_tmp34_ = _element_list;
 #line 229 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp38_ = _tmp37_->kind;
+										_tmp35_ = _element_index;
 #line 229 "/home/jens/Source/shotwell/src/Page.vala"
-										switch (_tmp38_) {
+										_tmp36_ = gee_list_get (_tmp34_, _tmp35_);
 #line 229 "/home/jens/Source/shotwell/src/Page.vala"
+										element = (InjectionGroupElement*) _tmp36_;
+#line 230 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp37_ = section;
+#line 230 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, g_menu_get_type ()) ? ((GMenu*) _tmp37_) : NULL);
+#line 230 "/home/jens/Source/shotwell/src/Page.vala"
+										menu = _tmp38_;
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp39_ = element;
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp40_ = _tmp39_->kind;
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+										switch (_tmp40_) {
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
 											case INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM:
-#line 2976 "Page.c"
+#line 2994 "Page.c"
 											{
 												GMenuItem* item = NULL;
-												InjectionGroupElement* _tmp39_ = NULL;
-												const gchar* _tmp40_ = NULL;
 												InjectionGroupElement* _tmp41_ = NULL;
 												const gchar* _tmp42_ = NULL;
-												gchar* _tmp43_ = NULL;
-												gchar* _tmp44_ = NULL;
-												GMenuItem* _tmp45_ = NULL;
-												GMenuItem* _tmp46_ = NULL;
-												InjectionGroupElement* _tmp47_ = NULL;
-												const gchar* _tmp48_ = NULL;
-												GMenu* _tmp52_ = NULL;
-												GMenuItem* _tmp53_ = NULL;
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp39_ = element;
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp40_ = _tmp39_->name;
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+												InjectionGroupElement* _tmp43_ = NULL;
+												const gchar* _tmp44_ = NULL;
+												gchar* _tmp45_ = NULL;
+												gchar* _tmp46_ = NULL;
+												GMenuItem* _tmp47_ = NULL;
+												GMenuItem* _tmp48_ = NULL;
+												InjectionGroupElement* _tmp49_ = NULL;
+												const gchar* _tmp50_ = NULL;
+												GMenu* _tmp54_ = NULL;
+												GMenuItem* _tmp55_ = NULL;
+#line 233 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp41_ = element;
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp42_ = _tmp41_->action;
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp43_ = g_strconcat ("win.", _tmp42_, NULL);
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp44_ = _tmp43_;
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp45_ = g_menu_item_new (_tmp40_, _tmp44_);
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp42_ = _tmp41_->name;
+#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp43_ = element;
+#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp44_ = _tmp43_->action;
+#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp45_ = g_strconcat ("win.", _tmp44_, NULL);
+#line 233 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp46_ = _tmp45_;
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
-												_g_free0 (_tmp44_);
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
-												item = _tmp46_;
 #line 233 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp47_ = element;
+												_tmp47_ = g_menu_item_new (_tmp42_, _tmp46_);
+#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp48_ = _tmp47_;
 #line 233 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp48_ = _tmp47_->accellerator;
+												_g_free0 (_tmp46_);
 #line 233 "/home/jens/Source/shotwell/src/Page.vala"
-												if (_tmp48_ != NULL) {
-#line 3017 "Page.c"
-													GMenuItem* _tmp49_ = NULL;
-													InjectionGroupElement* _tmp50_ = NULL;
-													const gchar* _tmp51_ = NULL;
-#line 234 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp49_ = item;
-#line 234 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp50_ = element;
-#line 234 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp51_ = _tmp50_->accellerator;
-#line 234 "/home/jens/Source/shotwell/src/Page.vala"
-													g_menu_item_set_attribute (_tmp49_, "accel", "s", _tmp51_, NULL);
-#line 3029 "Page.c"
+												item = _tmp48_;
+#line 235 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp49_ = element;
+#line 235 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp50_ = _tmp49_->accellerator;
+#line 235 "/home/jens/Source/shotwell/src/Page.vala"
+												if (_tmp50_ != NULL) {
+#line 3035 "Page.c"
+													GMenuItem* _tmp51_ = NULL;
+													InjectionGroupElement* _tmp52_ = NULL;
+													const gchar* _tmp53_ = NULL;
+#line 236 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp51_ = item;
+#line 236 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp52_ = element;
+#line 236 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp53_ = _tmp52_->accellerator;
+#line 236 "/home/jens/Source/shotwell/src/Page.vala"
+													g_menu_item_set_attribute (_tmp51_, "accel", "s", _tmp53_, NULL);
+#line 3047 "Page.c"
 												}
-#line 239 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp52_ = menu;
-#line 239 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp53_ = item;
-#line 239 "/home/jens/Source/shotwell/src/Page.vala"
-												g_menu_append_item (_tmp52_, _tmp53_);
-#line 240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 241 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp54_ = menu;
+#line 241 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp55_ = item;
+#line 241 "/home/jens/Source/shotwell/src/Page.vala"
+												g_menu_append_item (_tmp54_, _tmp55_);
+#line 242 "/home/jens/Source/shotwell/src/Page.vala"
 												_g_object_unref0 (item);
-#line 240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 242 "/home/jens/Source/shotwell/src/Page.vala"
 												break;
-#line 3041 "Page.c"
+#line 3059 "Page.c"
 											}
 											default:
 											{
-#line 242 "/home/jens/Source/shotwell/src/Page.vala"
+#line 244 "/home/jens/Source/shotwell/src/Page.vala"
 												break;
-#line 3047 "Page.c"
+#line 3065 "Page.c"
 											}
 										}
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
 										_g_object_unref0 (menu);
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
 										_injection_group_element_unref0 (element);
-#line 3054 "Page.c"
+#line 3072 "Page.c"
 									}
-#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
 									_g_object_unref0 (_element_list);
-#line 3058 "Page.c"
+#line 3076 "Page.c"
 								}
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 219 "/home/jens/Source/shotwell/src/Page.vala"
 								_g_object_unref0 (section);
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 219 "/home/jens/Source/shotwell/src/Page.vala"
 								_g_object_unref0 (submenu);
-#line 3064 "Page.c"
+#line 3082 "Page.c"
 							}
 						}
 					}
-#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
 					_injection_group_unref0 (group);
-#line 3070 "Page.c"
+#line 3088 "Page.c"
 				}
 			}
 		}
-#line 248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 250 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->menubar_injected = TRUE;
-#line 212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 214 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_groups = (_vala_array_free (injection_groups, injection_groups_length1, (GDestroyNotify) injection_group_unref), NULL);
-#line 3078 "Page.c"
+#line 3096 "Page.c"
 	}
-#line 251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 253 "/home/jens/Source/shotwell/src/Page.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (model, g_menu_model_get_type (), GMenuModel);
-#line 251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 253 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3084 "Page.c"
+#line 3102 "Page.c"
 }
 
 
@@ -3089,154 +3107,154 @@ static GtkToolbar* page_real_get_toolbar (Page* self) {
 	GtkToolbar* _tmp0_ = NULL;
 	GtkToolbar* _tmp12_ = NULL;
 	GtkToolbar* _tmp13_ = NULL;
-#line 255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->toolbar;
-#line 255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 3097 "Page.c"
+#line 3115 "Page.c"
 		GtkToolbar* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		GtkToolbar* _tmp8_ = NULL;
 		GtkToolbar* _tmp9_ = NULL;
 		GtkStyleContext* _tmp10_ = NULL;
 		GtkToolbar* _tmp11_ = NULL;
-#line 256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 258 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->toolbar_path;
-#line 256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 258 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp2_ == NULL) {
-#line 3108 "Page.c"
+#line 3126 "Page.c"
 			GtkToolbar* _tmp3_ = NULL;
-#line 256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 258 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = (GtkToolbar*) gtk_toolbar_new ();
-#line 256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 258 "/home/jens/Source/shotwell/src/Page.vala"
 			g_object_ref_sink (_tmp3_);
-#line 256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 258 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp1_);
-#line 256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 258 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp1_ = _tmp3_;
-#line 3118 "Page.c"
+#line 3136 "Page.c"
 		} else {
 			GtkBuilder* _tmp4_ = NULL;
 			const gchar* _tmp5_ = NULL;
 			GObject* _tmp6_ = NULL;
 			GtkToolbar* _tmp7_ = NULL;
-#line 257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 259 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = self->builder;
-#line 257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 259 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = self->priv->toolbar_path;
-#line 257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 259 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = gtk_builder_get_object (_tmp4_, _tmp5_);
-#line 257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 259 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_toolbar_get_type ()) ? ((GtkToolbar*) _tmp6_) : NULL);
-#line 257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 259 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp1_);
-#line 257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 259 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp1_ = _tmp7_;
-#line 3136 "Page.c"
+#line 3154 "Page.c"
 		}
-#line 256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 258 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _g_object_ref0 (_tmp1_);
-#line 256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 258 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->toolbar);
-#line 256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 258 "/home/jens/Source/shotwell/src/Page.vala"
 		self->toolbar = _tmp8_;
-#line 259 "/home/jens/Source/shotwell/src/Page.vala"
+#line 261 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->toolbar;
-#line 259 "/home/jens/Source/shotwell/src/Page.vala"
+#line 261 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 259 "/home/jens/Source/shotwell/src/Page.vala"
+#line 261 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_style_context_add_class (_tmp10_, "bottom-toolbar");
-#line 260 "/home/jens/Source/shotwell/src/Page.vala"
+#line 262 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->toolbar;
-#line 260 "/home/jens/Source/shotwell/src/Page.vala"
+#line 262 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_toolbar_set_icon_size (_tmp11_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3156 "Page.c"
+#line 3174 "Page.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 264 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->toolbar;
-#line 262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 264 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 264 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp13_;
-#line 262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 264 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3166 "Page.c"
+#line 3184 "Page.c"
 }
 
 
 GtkToolbar* page_get_toolbar (Page* self) {
-#line 254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->get_toolbar (self);
-#line 3175 "Page.c"
+#line 3193 "Page.c"
 }
 
 
 static GtkMenu* page_real_get_page_context_menu (Page* self) {
 	GtkMenu* result = NULL;
-#line 266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 268 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 268 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3185 "Page.c"
+#line 3203 "Page.c"
 }
 
 
 GtkMenu* page_get_page_context_menu (Page* self) {
-#line 265 "/home/jens/Source/shotwell/src/Page.vala"
+#line 267 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 265 "/home/jens/Source/shotwell/src/Page.vala"
+#line 267 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->get_page_context_menu (self);
-#line 3194 "Page.c"
+#line 3212 "Page.c"
 }
 
 
 static void page_real_switching_from (Page* self) {
 	const gchar* _tmp0_ = NULL;
-#line 270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 272 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = FALSE;
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 273 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->toolbar_path;
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 273 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 272 "/home/jens/Source/shotwell/src/Page.vala"
+#line 274 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->toolbar);
-#line 272 "/home/jens/Source/shotwell/src/Page.vala"
+#line 274 "/home/jens/Source/shotwell/src/Page.vala"
 		self->toolbar = NULL;
-#line 3210 "Page.c"
+#line 3228 "Page.c"
 	}
 }
 
 
 void page_switching_from (Page* self) {
-#line 269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 271 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 271 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switching_from (self);
-#line 3220 "Page.c"
+#line 3238 "Page.c"
 }
 
 
 static void page_real_switched_to (Page* self) {
-#line 276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 278 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = TRUE;
-#line 277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 279 "/home/jens/Source/shotwell/src/Page.vala"
 	page_add_ui (self);
-#line 278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 280 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_modifiers (self);
-#line 3231 "Page.c"
+#line 3249 "Page.c"
 }
 
 
 void page_switched_to (Page* self) {
-#line 275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 277 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 277 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switched_to (self);
-#line 3240 "Page.c"
+#line 3258 "Page.c"
 }
 
 
@@ -3245,58 +3263,58 @@ static void page_real_ready (Page* self) {
 
 
 void page_ready (Page* self) {
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 283 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 283 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->ready (self);
-#line 3253 "Page.c"
+#line 3271 "Page.c"
 }
 
 
 gboolean page_is_in_view (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 286 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->in_view;
-#line 285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3268 "Page.c"
+#line 3286 "Page.c"
 }
 
 
 static void page_real_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 290 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 3275 "Page.c"
+#line 3293 "Page.c"
 }
 
 
 void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 290 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 290 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switching_to_fullscreen (self, fsw);
-#line 3284 "Page.c"
+#line 3302 "Page.c"
 }
 
 
 static void page_real_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 293 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 3291 "Page.c"
+#line 3309 "Page.c"
 }
 
 
 void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 293 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 293 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->returning_from_fullscreen (self, fsw);
-#line 3300 "Page.c"
+#line 3318 "Page.c"
 }
 
 
@@ -3305,46 +3323,46 @@ GAction* page_get_action (Page* self, const gchar* name) {
 	AppWindow* aw = NULL;
 	AppWindow* _tmp0_ = NULL;
 	AppWindow* _tmp1_ = NULL;
-#line 294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 296 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 296 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 297 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 295 "/home/jens/Source/shotwell/src/Page.vala"
-	aw = _tmp0_;
 #line 297 "/home/jens/Source/shotwell/src/Page.vala"
+	aw = _tmp0_;
+#line 299 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = aw;
-#line 297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 299 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 3321 "Page.c"
+#line 3339 "Page.c"
 		AppWindow* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		GAction* _tmp4_ = NULL;
 		GAction* _tmp5_ = NULL;
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = aw;
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = name;
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_action_map_get_type (), GActionMap), _tmp3_);
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 300 "/home/jens/Source/shotwell/src/Page.vala"
 		result = _tmp5_;
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 300 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (aw);
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 300 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3340 "Page.c"
+#line 3358 "Page.c"
 	}
-#line 301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 303 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 303 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (aw);
-#line 301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 303 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3348 "Page.c"
+#line 3366 "Page.c"
 }
 
 
@@ -3354,92 +3372,92 @@ void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitiv
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 306 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 306 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 307 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 307 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 307 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 307 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 307 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3372 "Page.c"
+#line 3390 "Page.c"
 	}
-#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 307 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 308 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 308 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3380 "Page.c"
+#line 3398 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 309 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 309 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = sensitive;
-#line 307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 309 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3389 "Page.c"
+#line 3407 "Page.c"
 	}
-#line 304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 306 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3393 "Page.c"
+#line 3411 "Page.c"
 }
 
 
 void page_set_action_important (Page* self, const gchar* name, gboolean important) {
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 310 "/home/jens/Source/shotwell/src/Page.vala"
+#line 312 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 310 "/home/jens/Source/shotwell/src/Page.vala"
+#line 312 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 313 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 313 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = important;
-#line 311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 313 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_action_sensitive (self, _tmp0_, _tmp1_);
-#line 3410 "Page.c"
+#line 3428 "Page.c"
 }
 
 
 void page_set_action_visible (Page* self, const gchar* name, gboolean visible) {
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 316 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 316 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 317 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 317 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = visible;
-#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 317 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_action_sensitive (self, _tmp0_, _tmp1_);
-#line 3427 "Page.c"
+#line 3445 "Page.c"
 }
 
 
 void page_set_action_short_label (Page* self, const gchar* name, const gchar* short_label) {
 	const gchar* _tmp0_ = NULL;
-#line 318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 320 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 320 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 320 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (short_label != NULL);
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 321 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:319: => Set action short_label called for %s", _tmp0_);
-#line 3443 "Page.c"
+#line 321 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:321: => Set action short_label called for %s", _tmp0_);
+#line 3461 "Page.c"
 }
 
 
@@ -3452,58 +3470,58 @@ void page_set_action_details (Page* self, const gchar* name, const gchar* label,
 	const gchar* _tmp4_ = NULL;
 	GSimpleAction* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 324 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 324 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3470 "Page.c"
+#line 3488 "Page.c"
 	}
-#line 323 "/home/jens/Source/shotwell/src/Page.vala"
-	action = _tmp2_;
 #line 325 "/home/jens/Source/shotwell/src/Page.vala"
+	action = _tmp2_;
+#line 327 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 327 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
-#line 326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 328 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (action);
-#line 326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 328 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 3482 "Page.c"
+#line 3500 "Page.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 330 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = label;
-#line 328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 330 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 3488 "Page.c"
+#line 3506 "Page.c"
 		const gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 329 "/home/jens/Source/shotwell/src/Page.vala"
+#line 331 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = name;
-#line 329 "/home/jens/Source/shotwell/src/Page.vala"
+#line 331 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = label;
-#line 329 "/home/jens/Source/shotwell/src/Page.vala"
+#line 331 "/home/jens/Source/shotwell/src/Page.vala"
 		page_update_menu_item_label (self, _tmp5_, _tmp6_);
-#line 3497 "Page.c"
+#line 3515 "Page.c"
 	}
-#line 331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 333 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = action;
-#line 331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 333 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = sensitive;
-#line 331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 333 "/home/jens/Source/shotwell/src/Page.vala"
 	g_simple_action_set_enabled (_tmp7_, _tmp8_);
-#line 322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 324 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3507 "Page.c"
+#line 3525 "Page.c"
 }
 
 
@@ -3512,31 +3530,31 @@ void page_activate_action (Page* self, const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	GAction* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
-#line 334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 336 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 336 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 337 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 337 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 335 "/home/jens/Source/shotwell/src/Page.vala"
-	action = _tmp1_;
 #line 337 "/home/jens/Source/shotwell/src/Page.vala"
+	action = _tmp1_;
+#line 339 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 339 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 3530 "Page.c"
+#line 3548 "Page.c"
 		GAction* _tmp3_ = NULL;
-#line 338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 340 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = action;
-#line 338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 340 "/home/jens/Source/shotwell/src/Page.vala"
 		g_action_activate (_tmp3_, NULL);
-#line 3536 "Page.c"
+#line 3554 "Page.c"
 	}
-#line 334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 336 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3540 "Page.c"
+#line 3558 "Page.c"
 }
 
 
@@ -3547,53 +3565,53 @@ GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_war
 	GAction* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 342 "/home/jens/Source/shotwell/src/Page.vala"
-	action = _tmp1_;
 #line 344 "/home/jens/Source/shotwell/src/Page.vala"
+	action = _tmp1_;
+#line 346 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 346 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 347 "/home/jens/Source/shotwell/src/Page.vala"
 		result = action;
-#line 345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 347 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3569 "Page.c"
+#line 3587 "Page.c"
 	}
-#line 347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 349 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = log_warning;
-#line 347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 349 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 3575 "Page.c"
+#line 3593 "Page.c"
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_page_name (self);
-#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = name;
-#line 348 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:348: Page %s: Unable to locate common action %s", _tmp5_, _tmp6_);
-#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+		g_warning ("Page.vala:350: Page %s: Unable to locate common action %s", _tmp5_, _tmp6_);
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp5_);
-#line 3589 "Page.c"
+#line 3607 "Page.c"
 	}
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 352 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 352 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 352 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3597 "Page.c"
+#line 3615 "Page.c"
 }
 
 
@@ -3603,72 +3621,72 @@ void page_set_common_action_sensitive (Page* self, const gchar* name, gboolean s
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 355 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 355 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_common_action (self, _tmp0_, TRUE);
-#line 354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3621 "Page.c"
+#line 3639 "Page.c"
 	}
-#line 354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 357 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 357 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3629 "Page.c"
+#line 3647 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 358 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 358 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = sensitive;
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 358 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3638 "Page.c"
+#line 3656 "Page.c"
 	}
-#line 353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 355 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3642 "Page.c"
+#line 3660 "Page.c"
 }
 
 
 void page_set_common_action_label (Page* self, const gchar* name, const gchar* label) {
 	const gchar* _tmp0_ = NULL;
-#line 359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 361 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 361 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 361 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (label != NULL);
-#line 360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 360 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:360: Trying to set common action label for %s", _tmp0_);
-#line 3658 "Page.c"
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:362: Trying to set common action label for %s", _tmp0_);
+#line 3676 "Page.c"
 }
 
 
 void page_set_common_action_important (Page* self, const gchar* name, gboolean important) {
 	const gchar* _tmp0_ = NULL;
-#line 363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 365 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 365 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 366 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 364 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:364: Setting action to important: %s", _tmp0_);
-#line 3672 "Page.c"
+#line 366 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:366: Setting action to important: %s", _tmp0_);
+#line 3690 "Page.c"
 }
 
 
@@ -3678,106 +3696,106 @@ void page_activate_common_action (Page* self, const gchar* name) {
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 370 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 370 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_common_action (self, _tmp0_, TRUE);
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 370 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 370 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 370 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3696 "Page.c"
+#line 3714 "Page.c"
 	}
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 370 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 371 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 371 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3704 "Page.c"
+#line 3722 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 372 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 372 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_emit_by_name (_tmp4_, "activate", NULL);
-#line 3710 "Page.c"
+#line 3728 "Page.c"
 	}
-#line 367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3714 "Page.c"
+#line 3732 "Page.c"
 }
 
 
 gboolean page_get_ctrl_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 375 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 376 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->ctrl_pressed;
-#line 374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 376 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 376 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3729 "Page.c"
+#line 3747 "Page.c"
 }
 
 
 gboolean page_get_alt_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 379 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 380 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->alt_pressed;
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 380 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 380 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3744 "Page.c"
+#line 3762 "Page.c"
 }
 
 
 gboolean page_get_shift_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 383 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 384 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->shift_pressed;
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 384 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 384 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3759 "Page.c"
+#line 3777 "Page.c"
 }
 
 
 gboolean page_get_super_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 387 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 388 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->super_pressed;
-#line 386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 388 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 388 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3774 "Page.c"
+#line 3792 "Page.c"
 }
 
 
-static GVariant* _variant_new16 (gboolean value) {
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+static GVariant* _variant_new20 (gboolean value) {
+#line 394 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3781 "Page.c"
+#line 3799 "Page.c"
 }
 
 
@@ -3787,47 +3805,47 @@ void page_set_action_active (Page* self, const gchar* name, gboolean active) {
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 391 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 391 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3805 "Page.c"
+#line 3823 "Page.c"
 	}
-#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 393 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 393 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3813 "Page.c"
+#line 3831 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		GVariant* _tmp6_ = NULL;
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 394 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 394 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = active;
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp6_ = _variant_new16 (_tmp5_);
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 394 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp6_ = _variant_new20 (_tmp5_);
+#line 394 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_state (_tmp4_, _tmp6_);
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 394 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_variant_unref0 (_tmp6_);
-#line 3827 "Page.c"
+#line 3845 "Page.c"
 	}
-#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 391 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3831 "Page.c"
+#line 3849 "Page.c"
 }
 
 
@@ -3857,125 +3875,125 @@ static gboolean page_get_modifiers (Page* self, gboolean* ctrl, gboolean* alt, g
 	GdkModifierType _tmp14_ = 0;
 	GdkModifierType _tmp15_ = 0;
 	GdkModifierType _tmp16_ = 0;
-#line 396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 398 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_ == NULL;
-#line 397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 398 "/home/jens/Source/shotwell/src/Page.vala"
+#line 400 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_ctrl = FALSE;
-#line 399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 401 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_alt = FALSE;
-#line 400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 402 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_shift = FALSE;
-#line 401 "/home/jens/Source/shotwell/src/Page.vala"
-		_vala_super = FALSE;
 #line 403 "/home/jens/Source/shotwell/src/Page.vala"
+		_vala_super = FALSE;
+#line 405 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 405 "/home/jens/Source/shotwell/src/Page.vala"
 		if (ctrl) {
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 405 "/home/jens/Source/shotwell/src/Page.vala"
 			*ctrl = _vala_ctrl;
-#line 3889 "Page.c"
+#line 3907 "Page.c"
 		}
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 405 "/home/jens/Source/shotwell/src/Page.vala"
 		if (alt) {
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 405 "/home/jens/Source/shotwell/src/Page.vala"
 			*alt = _vala_alt;
-#line 3895 "Page.c"
+#line 3913 "Page.c"
 		}
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 405 "/home/jens/Source/shotwell/src/Page.vala"
 		if (shift) {
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 405 "/home/jens/Source/shotwell/src/Page.vala"
 			*shift = _vala_shift;
-#line 3901 "Page.c"
+#line 3919 "Page.c"
 		}
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 405 "/home/jens/Source/shotwell/src/Page.vala"
 		if (super) {
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 405 "/home/jens/Source/shotwell/src/Page.vala"
 			*super = _vala_super;
-#line 3907 "Page.c"
+#line 3925 "Page.c"
 		}
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 405 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3911 "Page.c"
+#line 3929 "Page.c"
 	}
-#line 408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = gdk_display_get_default ();
-#line 408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = gdk_display_get_device_manager (_tmp7_);
-#line 408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = gdk_device_manager_get_client_pointer (_tmp8_);
-#line 408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_window_get_device_position (_tmp6_, _tmp9_, &_tmp10_, &_tmp11_, &_tmp12_);
-#line 408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	x = _tmp10_;
-#line 408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	y = _tmp11_;
-#line 408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	mask = _tmp12_;
-#line 408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp5_);
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = mask;
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_ctrl = (_tmp13_ & GDK_CONTROL_MASK) != 0;
-#line 412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 414 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = mask;
-#line 412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 414 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_alt = (_tmp14_ & GDK_MOD1_MASK) != 0;
-#line 413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 415 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = mask;
-#line 413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 415 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_shift = (_tmp15_ & GDK_SHIFT_MASK) != 0;
-#line 414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 416 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = mask;
-#line 414 "/home/jens/Source/shotwell/src/Page.vala"
-	_vala_super = (_tmp16_ & GDK_MOD4_MASK) != 0;
 #line 416 "/home/jens/Source/shotwell/src/Page.vala"
+	_vala_super = (_tmp16_ & GDK_MOD4_MASK) != 0;
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	if (ctrl) {
-#line 416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 		*ctrl = _vala_ctrl;
-#line 3957 "Page.c"
+#line 3975 "Page.c"
 	}
-#line 416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	if (alt) {
-#line 416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 		*alt = _vala_alt;
-#line 3963 "Page.c"
+#line 3981 "Page.c"
 	}
-#line 416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	if (shift) {
-#line 416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 		*shift = _vala_shift;
-#line 3969 "Page.c"
+#line 3987 "Page.c"
 	}
-#line 416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	if (super) {
-#line 416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 		*super = _vala_super;
-#line 3975 "Page.c"
+#line 3993 "Page.c"
 	}
-#line 416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3979 "Page.c"
+#line 3997 "Page.c"
 }
 
 
@@ -4001,229 +4019,229 @@ static void page_update_modifiers (Page* self) {
 	gboolean _tmp30_ = FALSE;
 	gboolean _tmp31_ = FALSE;
 	gboolean _tmp32_ = FALSE;
-#line 419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 421 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
-	if (!_tmp4_) {
 #line 424 "/home/jens/Source/shotwell/src/Page.vala"
+	if (!_tmp4_) {
+#line 426 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4021 "Page.c"
+#line 4039 "Page.c"
 	}
-#line 427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->ctrl_pressed;
-#line 427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
-#line 4027 "Page.c"
+#line 4045 "Page.c"
 		gboolean _tmp7_ = FALSE;
-#line 427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ctrl_currently_pressed;
-#line 427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = !_tmp7_;
-#line 4033 "Page.c"
+#line 4051 "Page.c"
 	} else {
-#line 427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = FALSE;
-#line 4037 "Page.c"
+#line 4055 "Page.c"
 	}
-#line 427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 430 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_ctrl_released (self, NULL);
-#line 4043 "Page.c"
+#line 4061 "Page.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_ = FALSE;
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 431 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->ctrl_pressed;
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 431 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp9_) {
-#line 4051 "Page.c"
+#line 4069 "Page.c"
 			gboolean _tmp10_ = FALSE;
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 431 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = ctrl_currently_pressed;
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 431 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = _tmp10_;
-#line 4057 "Page.c"
+#line 4075 "Page.c"
 		} else {
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 431 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = FALSE;
-#line 4061 "Page.c"
+#line 4079 "Page.c"
 		}
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 431 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp8_) {
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 432 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_ctrl_pressed (self, NULL);
-#line 4067 "Page.c"
+#line 4085 "Page.c"
 		}
 	}
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->alt_pressed;
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_) {
-#line 4074 "Page.c"
+#line 4092 "Page.c"
 		gboolean _tmp13_ = FALSE;
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = alt_currently_pressed;
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = !_tmp13_;
-#line 4080 "Page.c"
+#line 4098 "Page.c"
 	} else {
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = FALSE;
-#line 4084 "Page.c"
+#line 4102 "Page.c"
 	}
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_) {
-#line 433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 435 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_alt_released (self, NULL);
-#line 4090 "Page.c"
+#line 4108 "Page.c"
 	} else {
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_ = FALSE;
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = self->priv->alt_pressed;
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp15_) {
-#line 4098 "Page.c"
+#line 4116 "Page.c"
 			gboolean _tmp16_ = FALSE;
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = alt_currently_pressed;
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = _tmp16_;
-#line 4104 "Page.c"
+#line 4122 "Page.c"
 		} else {
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = FALSE;
-#line 4108 "Page.c"
+#line 4126 "Page.c"
 		}
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp14_) {
-#line 435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_alt_pressed (self, NULL);
-#line 4114 "Page.c"
+#line 4132 "Page.c"
 		}
 	}
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 439 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->shift_pressed;
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 439 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
-#line 4121 "Page.c"
+#line 4139 "Page.c"
 		gboolean _tmp19_ = FALSE;
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 439 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = shift_currently_pressed;
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 439 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = !_tmp19_;
-#line 4127 "Page.c"
+#line 4145 "Page.c"
 	} else {
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 439 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = FALSE;
-#line 4131 "Page.c"
+#line 4149 "Page.c"
 	}
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 439 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp17_) {
-#line 438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 440 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_shift_released (self, NULL);
-#line 4137 "Page.c"
+#line 4155 "Page.c"
 	} else {
 		gboolean _tmp20_ = FALSE;
 		gboolean _tmp21_ = FALSE;
-#line 439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = self->priv->shift_pressed;
-#line 439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp21_) {
-#line 4145 "Page.c"
+#line 4163 "Page.c"
 			gboolean _tmp22_ = FALSE;
-#line 439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = shift_currently_pressed;
-#line 439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = _tmp22_;
-#line 4151 "Page.c"
+#line 4169 "Page.c"
 		} else {
-#line 439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = FALSE;
-#line 4155 "Page.c"
+#line 4173 "Page.c"
 		}
-#line 439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp20_) {
-#line 440 "/home/jens/Source/shotwell/src/Page.vala"
+#line 442 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_shift_pressed (self, NULL);
-#line 4161 "Page.c"
+#line 4179 "Page.c"
 		}
 	}
-#line 442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = self->priv->super_pressed;
-#line 442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp24_) {
-#line 4168 "Page.c"
+#line 4186 "Page.c"
 		gboolean _tmp25_ = FALSE;
-#line 442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = super_currently_pressed;
-#line 442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = !_tmp25_;
-#line 4174 "Page.c"
+#line 4192 "Page.c"
 	} else {
-#line 442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = FALSE;
-#line 4178 "Page.c"
+#line 4196 "Page.c"
 	}
-#line 442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp23_) {
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 445 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_super_released (self, NULL);
-#line 4184 "Page.c"
+#line 4202 "Page.c"
 	} else {
 		gboolean _tmp26_ = FALSE;
 		gboolean _tmp27_ = FALSE;
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = self->priv->super_pressed;
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp27_) {
-#line 4192 "Page.c"
+#line 4210 "Page.c"
 			gboolean _tmp28_ = FALSE;
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = super_currently_pressed;
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = _tmp28_;
-#line 4198 "Page.c"
+#line 4216 "Page.c"
 		} else {
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = FALSE;
-#line 4202 "Page.c"
+#line 4220 "Page.c"
 		}
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp26_) {
-#line 445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 447 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_super_pressed (self, NULL);
-#line 4208 "Page.c"
+#line 4226 "Page.c"
 		}
 	}
-#line 447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 449 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = ctrl_currently_pressed;
-#line 447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 449 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->ctrl_pressed = _tmp29_;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = alt_currently_pressed;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->alt_pressed = _tmp30_;
-#line 449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = shift_currently_pressed;
-#line 449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->shift_pressed = _tmp31_;
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 452 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp32_ = super_currently_pressed;
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 452 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->super_pressed = _tmp32_;
-#line 4227 "Page.c"
+#line 4245 "Page.c"
 }
 
 
@@ -4233,88 +4251,88 @@ PageWindow* page_get_page_window (Page* self) {
 	GtkContainer* _tmp0_ = NULL;
 	GtkContainer* _tmp1_ = NULL;
 	GtkWidget* _tmp2_ = NULL;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 	p = _tmp2_;
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 457 "/home/jens/Source/shotwell/src/Page.vala"
 	while (TRUE) {
-#line 4249 "Page.c"
+#line 4267 "Page.c"
 		GtkWidget* _tmp3_ = NULL;
 		GtkWidget* _tmp4_ = NULL;
 		GtkWidget* _tmp7_ = NULL;
 		GtkContainer* _tmp8_ = NULL;
 		GtkContainer* _tmp9_ = NULL;
 		GtkWidget* _tmp10_ = NULL;
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 457 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = p;
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 457 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!(_tmp3_ != NULL)) {
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 457 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 4262 "Page.c"
+#line 4280 "Page.c"
 		}
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = p;
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PAGE_WINDOW)) {
-#line 4268 "Page.c"
+#line 4286 "Page.c"
 			GtkWidget* _tmp5_ = NULL;
 			PageWindow* _tmp6_ = NULL;
-#line 457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = p;
-#line 457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE_WINDOW, PageWindow));
-#line 457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp6_;
-#line 457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (p);
-#line 457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 4281 "Page.c"
+#line 4299 "Page.c"
 		}
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 461 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = p;
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 461 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gtk_widget_get_parent (_tmp7_);
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 461 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 461 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 461 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (p);
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 461 "/home/jens/Source/shotwell/src/Page.vala"
 		p = _tmp10_;
-#line 4295 "Page.c"
+#line 4313 "Page.c"
 	}
-#line 462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 464 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 464 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (p);
-#line 462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 464 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4303 "Page.c"
+#line 4321 "Page.c"
 }
 
 
 CommandManager* page_get_command_manager (Page* self) {
 	CommandManager* result = NULL;
 	CommandManager* _tmp0_ = NULL;
-#line 465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 467 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4318 "Page.c"
+#line 4336 "Page.c"
 }
 
 
@@ -4323,25 +4341,25 @@ static void page_real_add_actions (Page* self) {
 
 
 void page_add_actions (Page* self) {
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->add_actions (self);
-#line 4331 "Page.c"
+#line 4349 "Page.c"
 }
 
 
-static gboolean _variant_get17 (GVariant* value) {
-#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+static gboolean _variant_get21 (GVariant* value) {
+#line 474 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_get_boolean (value);
-#line 4338 "Page.c"
+#line 4356 "Page.c"
 }
 
 
-static GVariant* _variant_new18 (gboolean value) {
-#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+static GVariant* _variant_new22 (gboolean value) {
+#line 474 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4345 "Page.c"
+#line 4363 "Page.c"
 }
 
 
@@ -4354,59 +4372,59 @@ void page_on_action_toggle (Page* self, GAction* action, GVariant* value) {
 	GVariant* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
 	GAction* _tmp6_ = NULL;
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 473 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 473 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION (action));
-#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 474 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = action;
-#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 474 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_action_get_state (_tmp0_);
-#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 474 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 472 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = _variant_get17 (_tmp2_);
-#line 472 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp4_ = _variant_new18 (!_tmp3_);
-#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = _variant_get21 (_tmp2_);
+#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp4_ = _variant_new22 (!_tmp3_);
+#line 474 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 474 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 474 "/home/jens/Source/shotwell/src/Page.vala"
 	new_state = _tmp5_;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 475 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = action;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 475 "/home/jens/Source/shotwell/src/Page.vala"
 	g_action_change_state (_tmp6_, new_state);
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 473 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_variant_unref0 (new_state);
-#line 4384 "Page.c"
+#line 4402 "Page.c"
 }
 
 
 void page_on_action_radio (Page* self, GAction* action, GVariant* value) {
 	GAction* _tmp0_ = NULL;
 	GVariant* _tmp1_ = NULL;
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION (action));
-#line 477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 479 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = action;
-#line 477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 479 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = value;
-#line 477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 479 "/home/jens/Source/shotwell/src/Page.vala"
 	g_action_change_state (_tmp0_, _tmp1_);
-#line 4401 "Page.c"
+#line 4419 "Page.c"
 }
 
 
 static void page_init_ui (Page* self) {
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 482 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
+#line 483 "/home/jens/Source/shotwell/src/Page.vala"
 	page_add_actions (self);
-#line 4410 "Page.c"
+#line 4428 "Page.c"
 }
 
 
@@ -4417,36 +4435,36 @@ static void page_add_ui (Page* self) {
 	GeeList* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
-#line 484 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (IS_PAGE (self));
 #line 486 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (IS_PAGE (self));
+#line 488 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 488 "/home/jens/Source/shotwell/src/Page.vala"
 	ui_filenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 489 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = ui_filenames;
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 489 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_collect_ui_filenames (self, _tmp1_);
-#line 488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 490 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = ui_filenames;
-#line 488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 490 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 490 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 490 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == 0) {
-#line 4439 "Page.c"
+#line 4457 "Page.c"
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_page_name (self);
-#line 489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 489 "/home/jens/Source/shotwell/src/Page.vala"
-		g_message ("Page.vala:489: No UI file specified for %s", _tmp6_);
-#line 489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+		g_message ("Page.vala:491: No UI file specified for %s", _tmp6_);
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp6_);
-#line 4450 "Page.c"
+#line 4468 "Page.c"
 	}
 	{
 		GeeList* _ui_filename_list = NULL;
@@ -4457,25 +4475,25 @@ static void page_add_ui (Page* self) {
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
 		gint _ui_filename_index = 0;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ui_filenames;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_list = _tmp8_;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _ui_filename_list;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_size = _tmp11_;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_index = -1;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 4479 "Page.c"
+#line 4497 "Page.c"
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
 			gint _tmp14_ = 0;
@@ -4484,90 +4502,90 @@ static void page_add_ui (Page* self) {
 			gint _tmp16_ = 0;
 			gpointer _tmp17_ = NULL;
 			const gchar* _tmp18_ = NULL;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _ui_filename_index;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 			_ui_filename_index = _tmp12_ + 1;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _ui_filename_index;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = _ui_filename_size;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!(_tmp13_ < _tmp14_)) {
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 4500 "Page.c"
+#line 4518 "Page.c"
 			}
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _ui_filename_list;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = _ui_filename_index;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 			ui_filename = (gchar*) _tmp17_;
-#line 492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = ui_filename;
-#line 492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 			page_init_load_ui (self, _tmp18_);
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (ui_filename);
-#line 4516 "Page.c"
+#line 4534 "Page.c"
 		}
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_ui_filename_list);
-#line 4520 "Page.c"
+#line 4538 "Page.c"
 	}
-#line 484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 486 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (ui_filenames);
-#line 4524 "Page.c"
+#line 4542 "Page.c"
 }
 
 
 void page_init_toolbar (Page* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 499 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 499 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 500 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 500 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 500 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->toolbar_path);
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 500 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->toolbar_path = _tmp1_;
-#line 4543 "Page.c"
+#line 4561 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4550 "Page.c"
+#line 4568 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4557 "Page.c"
+#line 4575 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 517 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4564 "Page.c"
+#line 4582 "Page.c"
 }
 
 
 static void _page_on_update_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 518 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4571 "Page.c"
+#line 4589 "Page.c"
 }
 
 
@@ -4595,87 +4613,87 @@ static void page_attach_view_signals (Page* self) {
 	ViewCollection* _tmp18_ = NULL;
 	ViewCollection* _tmp19_ = NULL;
 	ViewCollection* _tmp20_ = NULL;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 504 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 505 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->are_actions_attached;
-#line 503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 505 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 506 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4607 "Page.c"
+#line 4625 "Page.c"
 	}
-#line 507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	selected_count = _tmp4_;
-#line 508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (self);
-#line 508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 	count = _tmp8_;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 511 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = selected_count;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 511 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = count;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 511 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_actions (self, _tmp9_, _tmp10_);
-#line 510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 512 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = selected_count;
-#line 510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 512 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = count;
-#line 510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 512 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_actions (self, _tmp11_, _tmp12_);
-#line 513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = page_get_view (self);
-#line 513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = _tmp13_;
-#line 513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp14_, "items-state-changed", (GCallback) _page_on_update_actions_view_collection_items_state_changed, self, 0);
-#line 513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_get_view (self);
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_;
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp16_, "selection-group-altered", (GCallback) _page_on_update_actions_view_collection_selection_group_altered, self, 0);
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = page_get_view (self);
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 517 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp18_, "items-visibility-changed", (GCallback) _page_on_update_actions_view_collection_items_visibility_changed, self, 0);
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 517 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp18_);
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 518 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = page_get_view (self);
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 518 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_;
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 518 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _page_on_update_actions_data_collection_contents_altered, self, 0);
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
-	_data_collection_unref0 (_tmp20_);
 #line 518 "/home/jens/Source/shotwell/src/Page.vala"
+	_data_collection_unref0 (_tmp20_);
+#line 520 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = TRUE;
-#line 4679 "Page.c"
+#line 4697 "Page.c"
 }
 
 
@@ -4693,109 +4711,109 @@ static void page_detach_view_signals (Page* self) {
 	ViewCollection* _tmp10_ = NULL;
 	ViewCollection* _tmp11_ = NULL;
 	guint _tmp12_ = 0U;
-#line 522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 524 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->are_actions_attached;
-#line 523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4705 "Page.c"
+#line 4723 "Page.c"
 	}
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _page_on_update_actions_view_collection_items_state_changed, self);
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 529 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (self);
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 529 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 529 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 529 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _page_on_update_actions_view_collection_selection_group_altered, self);
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 529 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 530 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = page_get_view (self);
-#line 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 530 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 530 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp9_, NULL, FALSE);
-#line 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 530 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _page_on_update_actions_view_collection_items_visibility_changed, self);
-#line 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 530 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = page_get_view (self);
-#line 529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_;
-#line 529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp12_, NULL, FALSE);
-#line 529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _page_on_update_actions_data_collection_contents_altered, self);
-#line 529 "/home/jens/Source/shotwell/src/Page.vala"
-	_data_collection_unref0 (_tmp11_);
 #line 531 "/home/jens/Source/shotwell/src/Page.vala"
+	_data_collection_unref0 (_tmp11_);
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = FALSE;
-#line 4749 "Page.c"
+#line 4767 "Page.c"
 }
 
 
 static void _page_on_update_actions_on_idle_one_shot_callback (gpointer self) {
-#line 536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions_on_idle ((Page*) self);
-#line 4756 "Page.c"
+#line 4774 "Page.c"
 }
 
 
 static void page_on_update_actions (Page* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp6_ = NULL;
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 536 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->update_actions_scheduler;
-#line 535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 537 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 4769 "Page.c"
+#line 4787 "Page.c"
 		gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		OneShotScheduler* _tmp5_ = NULL;
-#line 536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = page_get_page_name (self);
-#line 536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp1_;
-#line 536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = g_strdup_printf ("Update actions scheduler for %s", _tmp2_);
-#line 536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_;
-#line 536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = one_shot_scheduler_new (_tmp4_, _page_on_update_actions_on_idle_one_shot_callback, self);
-#line 536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 		_one_shot_scheduler_unref0 (self->priv->update_actions_scheduler);
-#line 536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->update_actions_scheduler = _tmp5_;
-#line 536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp4_);
-#line 536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 538 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp2_);
-#line 4793 "Page.c"
+#line 4811 "Page.c"
 	}
-#line 541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->update_actions_scheduler;
-#line 541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 543 "/home/jens/Source/shotwell/src/Page.vala"
 	one_shot_scheduler_at_priority_idle (_tmp6_, G_PRIORITY_LOW);
-#line 4799 "Page.c"
+#line 4817 "Page.c"
 }
 
 
@@ -4807,35 +4825,35 @@ static void page_on_update_actions_on_idle (Page* self) {
 	ViewCollection* _tmp4_ = NULL;
 	ViewCollection* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
-#line 544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 548 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4819 "Page.c"
+#line 4837 "Page.c"
 	}
-#line 548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 550 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 550 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 550 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 550 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (self);
-#line 548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 550 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 550 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
-#line 548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 550 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_actions (self, _tmp3_, _tmp6_);
-#line 548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 550 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 550 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 4839 "Page.c"
+#line 4857 "Page.c"
 }
 
 
@@ -4844,34 +4862,34 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 	const gchar* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 553 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 553 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ui_filename != NULL);
-#line 552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = ui_filename;
-#line 552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = resources_get_ui (_tmp0_);
-#line 552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 	ui_file = _tmp1_;
-#line 4858 "Page.c"
+#line 4876 "Page.c"
 	{
 		GtkBuilder* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->builder;
-#line 555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = g_file_get_path (ui_file);
-#line 555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_;
-#line 555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_builder_add_from_file (_tmp2_, _tmp4_, &_inner_error_);
-#line 555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp4_);
-#line 555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4875 "Page.c"
+#line 4893 "Page.c"
 			goto __catch251_g_error;
 		}
 	}
@@ -4887,72 +4905,72 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 		gchar* _tmp10_ = NULL;
 		Application* _tmp11_ = NULL;
 		Application* _tmp12_ = NULL;
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 556 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 556 "/home/jens/Source/shotwell/src/Page.vala"
 		_inner_error_ = NULL;
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = g_file_get_path (ui_file);
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = err;
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->message;
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = g_strdup_printf ("Error loading UI file %s: %s", _tmp6_, _tmp8_);
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_;
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
 		app_window_error_message (_tmp10_, NULL);
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp10_);
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_free0 (_tmp6_);
 #line 559 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_free0 (_tmp6_);
+#line 561 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = application_get_instance ();
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 561 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = _tmp11_;
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 561 "/home/jens/Source/shotwell/src/Page.vala"
 		application_panic (_tmp12_);
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 561 "/home/jens/Source/shotwell/src/Page.vala"
 		_application_unref0 (_tmp12_);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 556 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_error_free0 (err);
-#line 4923 "Page.c"
+#line 4941 "Page.c"
 	}
 	__finally251:
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 556 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 556 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (ui_file);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 556 "/home/jens/Source/shotwell/src/Page.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 556 "/home/jens/Source/shotwell/src/Page.vala"
 		g_clear_error (&_inner_error_);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 556 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4936 "Page.c"
+#line 4954 "Page.c"
 	}
-#line 551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 553 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (ui_file);
-#line 4940 "Page.c"
+#line 4958 "Page.c"
 }
 
 
 static void page_real_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) {
-#line 566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 4947 "Page.c"
+#line 4965 "Page.c"
 }
 
 
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) {
-#line 566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->init_collect_ui_filenames (self, ui_filenames);
-#line 4956 "Page.c"
+#line 4974 "Page.c"
 }
 
 
@@ -4961,32 +4979,32 @@ static InjectionGroup** page_real_init_collect_injection_groups (Page* self, int
 	InjectionGroup** _tmp0_ = NULL;
 	InjectionGroup** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = g_new0 (InjectionGroup*, 0 + 1);
-#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1__length1 = 0;
-#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 	if (result_length1) {
-#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 		*result_length1 = _tmp1__length1;
-#line 4975 "Page.c"
+#line 4993 "Page.c"
 	}
-#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4981 "Page.c"
+#line 4999 "Page.c"
 }
 
 
 InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1) {
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 573 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 573 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->init_collect_injection_groups (self, result_length1);
-#line 4990 "Page.c"
+#line 5008 "Page.c"
 }
 
 
@@ -4995,11 +5013,11 @@ static void page_real_init_actions (Page* self, gint selected_count, gint count)
 
 
 void page_init_actions (Page* self, gint selected_count, gint count) {
-#line 577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 579 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 579 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->init_actions (self, selected_count, count);
-#line 5003 "Page.c"
+#line 5021 "Page.c"
 }
 
 
@@ -5008,48 +5026,48 @@ static void page_real_update_actions (Page* self, gint selected_count, gint coun
 
 
 void page_update_actions (Page* self, gint selected_count, gint count) {
-#line 583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 585 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 585 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->update_actions (self, selected_count, count);
-#line 5016 "Page.c"
+#line 5034 "Page.c"
 }
 
 
 static void _page_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 598 "/home/jens/Source/shotwell/src/Page.vala"
+#line 600 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_begin ((Page*) self, context);
-#line 5023 "Page.c"
+#line 5041 "Page.c"
 }
 
 
 static void _page_on_drag_data_get_gtk_widget_drag_data_get (GtkWidget* _sender, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time_, gpointer self) {
-#line 599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 601 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_data_get ((Page*) self, context, selection_data, info, time_);
-#line 5030 "Page.c"
+#line 5048 "Page.c"
 }
 
 
 static void _page_on_drag_data_delete_gtk_widget_drag_data_delete (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 602 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_data_delete ((Page*) self, context);
-#line 5037 "Page.c"
+#line 5055 "Page.c"
 }
 
 
 static void _page_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_end ((Page*) self, context);
-#line 5044 "Page.c"
+#line 5062 "Page.c"
 }
 
 
 static gboolean _page_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender, GdkDragContext* context, GtkDragResult _result_, gpointer self) {
 	gboolean result;
 	result = page_on_drag_failed ((Page*) self, context, _result_);
-#line 602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 604 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5053 "Page.c"
+#line 5071 "Page.c"
 }
 
 
@@ -5065,53 +5083,53 @@ void page_enable_drag_source (Page* self, GdkDragAction actions, GtkTargetEntry*
 	GtkWidget* _tmp7_ = NULL;
 	GtkWidget* _tmp8_ = NULL;
 	GtkWidget* _tmp9_ = NULL;
-#line 588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 590 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 591 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 591 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5077 "Page.c"
+#line 5095 "Page.c"
 	}
-#line 592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 594 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 592 "/home/jens/Source/shotwell/src/Page.vala"
-	_vala_assert (_tmp1_ != NULL, "event_source != null");
 #line 594 "/home/jens/Source/shotwell/src/Page.vala"
+	_vala_assert (_tmp1_ != NULL, "event_source != null");
+#line 596 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 596 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = source_target_entries;
-#line 594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 596 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3__length1 = source_target_entries_length1;
-#line 594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 596 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = actions;
-#line 594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 596 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_set (_tmp2_, GDK_BUTTON1_MASK, _tmp3_, _tmp3__length1, _tmp4_);
-#line 598 "/home/jens/Source/shotwell/src/Page.vala"
+#line 600 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->event_source;
-#line 598 "/home/jens/Source/shotwell/src/Page.vala"
+#line 600 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp5_, "drag-begin", (GCallback) _page_on_drag_begin_gtk_widget_drag_begin, self, 0);
-#line 599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 601 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->event_source;
-#line 599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 601 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp6_, "drag-data-get", (GCallback) _page_on_drag_data_get_gtk_widget_drag_data_get, self, 0);
-#line 600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 602 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->event_source;
-#line 600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 602 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp7_, "drag-data-delete", (GCallback) _page_on_drag_data_delete_gtk_widget_drag_data_delete, self, 0);
-#line 601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->event_source;
-#line 601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp8_, "drag-end", (GCallback) _page_on_drag_end_gtk_widget_drag_end, self, 0);
-#line 602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 604 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 602 "/home/jens/Source/shotwell/src/Page.vala"
-	g_signal_connect_object (_tmp9_, "drag-failed", (GCallback) _page_on_drag_failed_gtk_widget_drag_failed, self, 0);
 #line 604 "/home/jens/Source/shotwell/src/Page.vala"
+	g_signal_connect_object (_tmp9_, "drag-failed", (GCallback) _page_on_drag_failed_gtk_widget_drag_failed, self, 0);
+#line 606 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = TRUE;
-#line 5115 "Page.c"
+#line 5133 "Page.c"
 }
 
 
@@ -5129,86 +5147,86 @@ void page_disable_drag_source (Page* self) {
 	GtkWidget* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
 	GtkWidget* _tmp12_ = NULL;
-#line 607 "/home/jens/Source/shotwell/src/Page.vala"
+#line 609 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 610 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 610 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 611 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5141 "Page.c"
+#line 5159 "Page.c"
 	}
-#line 611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 613 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 611 "/home/jens/Source/shotwell/src/Page.vala"
-	_vala_assert (_tmp1_ != NULL, "event_source != null");
 #line 613 "/home/jens/Source/shotwell/src/Page.vala"
+	_vala_assert (_tmp1_ != NULL, "event_source != null");
+#line 615 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 615 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-begin", gtk_widget_get_type (), &_tmp3_, NULL, FALSE);
-#line 613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 615 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _page_on_drag_begin_gtk_widget_drag_begin, self);
-#line 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 616 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->event_source;
-#line 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 616 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-data-get", gtk_widget_get_type (), &_tmp5_, NULL, FALSE);
-#line 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 616 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _page_on_drag_data_get_gtk_widget_drag_data_get, self);
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 617 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->event_source;
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 617 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-data-delete", gtk_widget_get_type (), &_tmp7_, NULL, FALSE);
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 617 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _page_on_drag_data_delete_gtk_widget_drag_data_delete, self);
-#line 616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 618 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->event_source;
-#line 616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 618 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-end", gtk_widget_get_type (), &_tmp9_, NULL, FALSE);
-#line 616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 618 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _page_on_drag_end_gtk_widget_drag_end, self);
-#line 617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 619 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->event_source;
-#line 617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 619 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#line 617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 619 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _page_on_drag_failed_gtk_widget_drag_failed, self);
-#line 618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 620 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->event_source;
-#line 618 "/home/jens/Source/shotwell/src/Page.vala"
-	gtk_drag_source_unset (_tmp12_);
 #line 620 "/home/jens/Source/shotwell/src/Page.vala"
+	gtk_drag_source_unset (_tmp12_);
+#line 622 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = FALSE;
-#line 5183 "Page.c"
+#line 5201 "Page.c"
 }
 
 
 gboolean page_is_dnd_enabled (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 625 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 626 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 626 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 626 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5198 "Page.c"
+#line 5216 "Page.c"
 }
 
 
 static void page_on_drag_begin (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 629 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 629 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 630 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 630 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-begin", _tmp0_);
-#line 5212 "Page.c"
+#line 5230 "Page.c"
 }
 
 
@@ -5217,72 +5235,72 @@ static void page_on_drag_data_get (Page* self, GdkDragContext* context, GtkSelec
 	GtkSelectionData* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
 	guint _tmp3_ = 0U;
-#line 631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 631 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (selection_data != NULL);
 #line 633 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (selection_data != NULL);
+#line 635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = selection_data;
-#line 633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = info;
-#line 633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = time;
-#line 633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 635 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-data-get", _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 5237 "Page.c"
+#line 5255 "Page.c"
 }
 
 
 static void page_on_drag_data_delete (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 638 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 638 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 639 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 639 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-data-delete", _tmp0_);
-#line 5251 "Page.c"
+#line 5269 "Page.c"
 }
 
 
 static void page_on_drag_end (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 642 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 642 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 643 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 643 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-end", _tmp0_);
-#line 5265 "Page.c"
+#line 5283 "Page.c"
 }
 
 
 static gboolean page_real_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) {
 	gboolean result = FALSE;
-#line 648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 650 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 649 "/home/jens/Source/shotwell/src/Page.vala"
+#line 651 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 649 "/home/jens/Source/shotwell/src/Page.vala"
+#line 651 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5277 "Page.c"
+#line 5295 "Page.c"
 }
 
 
 gboolean page_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) {
-#line 648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 650 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 650 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->source_drag_failed (self, context, drag_result);
-#line 5286 "Page.c"
+#line 5304 "Page.c"
 }
 
 
@@ -5291,21 +5309,21 @@ static gboolean page_on_drag_failed (Page* self, GdkDragContext* context, GtkDra
 	GdkDragContext* _tmp0_ = NULL;
 	GtkDragResult _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 654 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 654 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 655 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 655 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = drag_result;
-#line 653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 655 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_source_drag_failed (self, _tmp0_, _tmp1_);
-#line 653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 655 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp2_;
-#line 653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 655 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5309 "Page.c"
+#line 5327 "Page.c"
 }
 
 
@@ -5334,291 +5352,291 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie
 	GdkPoint _tmp20_ = {0};
 	gint _tmp21_ = 0;
 	gint _tmp22_ = 0;
-#line 660 "/home/jens/Source/shotwell/src/Page.vala"
+#line 662 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 661 "/home/jens/Source/shotwell/src/Page.vala"
+#line 663 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 661 "/home/jens/Source/shotwell/src/Page.vala"
+#line 663 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 664 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_x = 0;
-#line 663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 665 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_y = 0;
-#line 664 "/home/jens/Source/shotwell/src/Page.vala"
-		_vala_mask = 0;
 #line 666 "/home/jens/Source/shotwell/src/Page.vala"
+		_vala_mask = 0;
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 		if (x) {
-#line 666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 			*x = _vala_x;
-#line 5356 "Page.c"
+#line 5374 "Page.c"
 		}
-#line 666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 		if (y) {
-#line 666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 			*y = _vala_y;
-#line 5362 "Page.c"
+#line 5380 "Page.c"
 		}
-#line 666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 		if (mask) {
-#line 666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 			*mask = _vala_mask;
-#line 5368 "Page.c"
+#line 5386 "Page.c"
 		}
-#line 666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 5372 "Page.c"
+#line 5390 "Page.c"
 	}
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 671 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 671 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (_tmp1_);
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 671 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gdk_display_get_default ();
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 671 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_display_get_device_manager (_tmp3_);
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 671 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gdk_device_manager_get_client_pointer (_tmp4_);
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 671 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_window_get_device_position (_tmp2_, _tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 671 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_x = _tmp6_;
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 671 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_y = _tmp7_;
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 671 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_mask = _tmp8_;
-#line 672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 674 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->last_down;
-#line 672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 674 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_.x;
-#line 672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 674 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_ < 0) {
-#line 672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 674 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = TRUE;
-#line 5400 "Page.c"
+#line 5418 "Page.c"
 	} else {
 		GdkPoint _tmp12_ = {0};
 		gint _tmp13_ = 0;
-#line 672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 674 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->last_down;
-#line 672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 674 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_.y;
-#line 672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 674 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp13_ < 0;
-#line 5410 "Page.c"
+#line 5428 "Page.c"
 	}
-#line 672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 674 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp9_) {
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 		if (x) {
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 			*x = _vala_x;
-#line 5420 "Page.c"
+#line 5438 "Page.c"
 		}
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 		if (y) {
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 			*y = _vala_y;
-#line 5426 "Page.c"
+#line 5444 "Page.c"
 		}
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 		if (mask) {
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 			*mask = _vala_mask;
-#line 5432 "Page.c"
+#line 5450 "Page.c"
 		}
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 5436 "Page.c"
+#line 5454 "Page.c"
 	}
-#line 679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = _vala_x;
-#line 679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->last_down;
-#line 679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_.x;
-#line 679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = abs (_tmp14_ - _tmp16_);
-#line 679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp17_ >= 0x7FFF) {
-#line 5448 "Page.c"
+#line 5466 "Page.c"
 		gint _tmp18_ = 0;
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _vala_x;
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_x = _tmp18_ + 0xFFFF;
-#line 5454 "Page.c"
+#line 5472 "Page.c"
 	}
-#line 682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 684 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = _vala_y;
-#line 682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 684 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = self->priv->last_down;
-#line 682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 684 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = _tmp20_.y;
-#line 682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 684 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = abs (_tmp19_ - _tmp21_);
-#line 682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 684 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp22_ >= 0x7FFF) {
-#line 5466 "Page.c"
+#line 5484 "Page.c"
 		gint _tmp23_ = 0;
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 685 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _vala_y;
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 685 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_y = _tmp23_ + 0xFFFF;
-#line 5472 "Page.c"
+#line 5490 "Page.c"
 	}
-#line 685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 	if (x) {
-#line 685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 		*x = _vala_x;
-#line 5480 "Page.c"
+#line 5498 "Page.c"
 	}
-#line 685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 	if (y) {
-#line 685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 		*y = _vala_y;
-#line 5486 "Page.c"
+#line 5504 "Page.c"
 	}
-#line 685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 	if (mask) {
-#line 685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 		*mask = _vala_mask;
-#line 5492 "Page.c"
+#line 5510 "Page.c"
 	}
-#line 685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 687 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5496 "Page.c"
+#line 5514 "Page.c"
 }
 
 
 static gboolean page_real_on_left_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 690 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 691 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 691 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5508 "Page.c"
+#line 5526 "Page.c"
 }
 
 
 gboolean page_on_left_click (Page* self, GdkEventButton* event) {
-#line 688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 690 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 690 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_left_click (self, event);
-#line 5517 "Page.c"
+#line 5535 "Page.c"
 }
 
 
 static gboolean page_real_on_middle_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 694 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 695 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 695 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5529 "Page.c"
+#line 5547 "Page.c"
 }
 
 
 gboolean page_on_middle_click (Page* self, GdkEventButton* event) {
-#line 692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 694 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 694 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_middle_click (self, event);
-#line 5538 "Page.c"
+#line 5556 "Page.c"
 }
 
 
 static gboolean page_real_on_right_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 698 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5550 "Page.c"
+#line 5568 "Page.c"
 }
 
 
 gboolean page_on_right_click (Page* self, GdkEventButton* event) {
-#line 696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 698 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 698 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_right_click (self, event);
-#line 5559 "Page.c"
+#line 5577 "Page.c"
 }
 
 
 static gboolean page_real_on_left_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 700 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 703 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 703 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5571 "Page.c"
+#line 5589 "Page.c"
 }
 
 
 gboolean page_on_left_released (Page* self, GdkEventButton* event) {
-#line 700 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 700 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_left_released (self, event);
-#line 5580 "Page.c"
+#line 5598 "Page.c"
 }
 
 
 static gboolean page_real_on_middle_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 704 "/home/jens/Source/shotwell/src/Page.vala"
+#line 706 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 707 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 707 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5592 "Page.c"
+#line 5610 "Page.c"
 }
 
 
 gboolean page_on_middle_released (Page* self, GdkEventButton* event) {
-#line 704 "/home/jens/Source/shotwell/src/Page.vala"
+#line 706 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 704 "/home/jens/Source/shotwell/src/Page.vala"
+#line 706 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_middle_released (self, event);
-#line 5601 "Page.c"
+#line 5619 "Page.c"
 }
 
 
 static gboolean page_real_on_right_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 710 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 711 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 711 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5613 "Page.c"
+#line 5631 "Page.c"
 }
 
 
 gboolean page_on_right_released (Page* self, GdkEventButton* event) {
-#line 708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 710 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 710 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_right_released (self, event);
-#line 5622 "Page.c"
+#line 5640 "Page.c"
 }
 
 
@@ -5626,19 +5644,19 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 712 "/home/jens/Source/shotwell/src/Page.vala"
+#line 714 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 712 "/home/jens/Source/shotwell/src/Page.vala"
+#line 714 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 715 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 715 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->button;
-#line 713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 715 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 715 "/home/jens/Source/shotwell/src/Page.vala"
 		case 1:
-#line 5642 "Page.c"
+#line 5660 "Page.c"
 		{
 			GtkWidget* _tmp2_ = NULL;
 			GdkEventButton* _tmp4_ = NULL;
@@ -5647,79 +5665,79 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 			gdouble _tmp7_ = 0.0;
 			GdkEventButton* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 717 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = self->priv->event_source;
-#line 715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 717 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp2_ != NULL) {
-#line 5655 "Page.c"
+#line 5673 "Page.c"
 				GtkWidget* _tmp3_ = NULL;
-#line 716 "/home/jens/Source/shotwell/src/Page.vala"
+#line 718 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp3_ = self->priv->event_source;
-#line 716 "/home/jens/Source/shotwell/src/Page.vala"
+#line 718 "/home/jens/Source/shotwell/src/Page.vala"
 				gtk_widget_grab_focus (_tmp3_);
-#line 5661 "Page.c"
+#line 5679 "Page.c"
 			}
-#line 719 "/home/jens/Source/shotwell/src/Page.vala"
+#line 721 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = event;
-#line 719 "/home/jens/Source/shotwell/src/Page.vala"
+#line 721 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp4_->x;
-#line 719 "/home/jens/Source/shotwell/src/Page.vala"
+#line 721 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down.x = (gint) _tmp5_;
-#line 720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = event;
-#line 720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _tmp6_->y;
-#line 720 "/home/jens/Source/shotwell/src/Page.vala"
-			self->priv->last_down.y = (gint) _tmp7_;
 #line 722 "/home/jens/Source/shotwell/src/Page.vala"
+			self->priv->last_down.y = (gint) _tmp7_;
+#line 724 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = event;
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 724 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = page_on_left_click (self, _tmp8_);
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 724 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp9_;
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 724 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5683 "Page.c"
+#line 5701 "Page.c"
 		}
-#line 713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 715 "/home/jens/Source/shotwell/src/Page.vala"
 		case 2:
-#line 5687 "Page.c"
+#line 5705 "Page.c"
 		{
 			GdkEventButton* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
-#line 725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 727 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = event;
-#line 725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 727 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = page_on_middle_click (self, _tmp10_);
-#line 725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 727 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp11_;
-#line 725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 727 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5699 "Page.c"
+#line 5717 "Page.c"
 		}
-#line 713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 715 "/home/jens/Source/shotwell/src/Page.vala"
 		case 3:
-#line 5703 "Page.c"
+#line 5721 "Page.c"
 		{
 			GdkEventButton* _tmp12_ = NULL;
 			gboolean _tmp13_ = FALSE;
-#line 728 "/home/jens/Source/shotwell/src/Page.vala"
+#line 730 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = event;
-#line 728 "/home/jens/Source/shotwell/src/Page.vala"
+#line 730 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = page_on_right_click (self, _tmp12_);
-#line 728 "/home/jens/Source/shotwell/src/Page.vala"
+#line 730 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp13_;
-#line 728 "/home/jens/Source/shotwell/src/Page.vala"
+#line 730 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5715 "Page.c"
+#line 5733 "Page.c"
 		}
 		default:
 		{
-#line 731 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 731 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5723 "Page.c"
+#line 5741 "Page.c"
 		}
 	}
 }
@@ -5729,78 +5747,78 @@ static gboolean page_on_button_released_internal (Page* self, GdkEventButton* ev
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 737 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 737 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 738 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 738 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->button;
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 738 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 738 "/home/jens/Source/shotwell/src/Page.vala"
 		case 1:
-#line 5745 "Page.c"
+#line 5763 "Page.c"
 		{
 			GdkPoint _tmp2_ = {0};
 			GdkEventButton* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 741 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_.x = -1;
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 741 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_.y = -1;
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
-			self->priv->last_down = _tmp2_;
 #line 741 "/home/jens/Source/shotwell/src/Page.vala"
+			self->priv->last_down = _tmp2_;
+#line 743 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = event;
-#line 741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 743 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = page_on_left_released (self, _tmp3_);
-#line 741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 743 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp4_;
-#line 741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 743 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5764 "Page.c"
+#line 5782 "Page.c"
 		}
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 738 "/home/jens/Source/shotwell/src/Page.vala"
 		case 2:
-#line 5768 "Page.c"
+#line 5786 "Page.c"
 		{
 			GdkEventButton* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 746 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = event;
-#line 744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 746 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = page_on_middle_released (self, _tmp5_);
-#line 744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 746 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp6_;
-#line 744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 746 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5780 "Page.c"
+#line 5798 "Page.c"
 		}
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 738 "/home/jens/Source/shotwell/src/Page.vala"
 		case 3:
-#line 5784 "Page.c"
+#line 5802 "Page.c"
 		{
 			GdkEventButton* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
-#line 747 "/home/jens/Source/shotwell/src/Page.vala"
+#line 749 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = event;
-#line 747 "/home/jens/Source/shotwell/src/Page.vala"
+#line 749 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = page_on_right_released (self, _tmp7_);
-#line 747 "/home/jens/Source/shotwell/src/Page.vala"
+#line 749 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp8_;
-#line 747 "/home/jens/Source/shotwell/src/Page.vala"
+#line 749 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5796 "Page.c"
+#line 5814 "Page.c"
 		}
 		default:
 		{
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 752 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 752 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5804 "Page.c"
+#line 5822 "Page.c"
 		}
 	}
 }
@@ -5808,195 +5826,195 @@ static gboolean page_on_button_released_internal (Page* self, GdkEventButton* ev
 
 static gboolean page_real_on_ctrl_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 757 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 757 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5816 "Page.c"
+#line 5834 "Page.c"
 }
 
 
 gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event) {
-#line 754 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 754 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_ctrl_pressed (self, event);
-#line 5825 "Page.c"
+#line 5843 "Page.c"
 }
 
 
 static gboolean page_real_on_ctrl_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5835 "Page.c"
+#line 5853 "Page.c"
 }
 
 
 gboolean page_on_ctrl_released (Page* self, GdkEventKey* event) {
-#line 758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 760 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 760 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_ctrl_released (self, event);
-#line 5844 "Page.c"
+#line 5862 "Page.c"
 }
 
 
 static gboolean page_real_on_alt_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 765 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 765 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5854 "Page.c"
+#line 5872 "Page.c"
 }
 
 
 gboolean page_on_alt_pressed (Page* self, GdkEventKey* event) {
-#line 762 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 762 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_alt_pressed (self, event);
-#line 5863 "Page.c"
+#line 5881 "Page.c"
 }
 
 
 static gboolean page_real_on_alt_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 769 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 769 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5873 "Page.c"
+#line 5891 "Page.c"
 }
 
 
 gboolean page_on_alt_released (Page* self, GdkEventKey* event) {
-#line 766 "/home/jens/Source/shotwell/src/Page.vala"
+#line 768 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 766 "/home/jens/Source/shotwell/src/Page.vala"
+#line 768 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_alt_released (self, event);
-#line 5882 "Page.c"
+#line 5900 "Page.c"
 }
 
 
 static gboolean page_real_on_shift_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 773 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 773 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5892 "Page.c"
+#line 5910 "Page.c"
 }
 
 
 gboolean page_on_shift_pressed (Page* self, GdkEventKey* event) {
-#line 770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 772 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 772 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_shift_pressed (self, event);
-#line 5901 "Page.c"
+#line 5919 "Page.c"
 }
 
 
 static gboolean page_real_on_shift_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 777 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 777 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5911 "Page.c"
+#line 5929 "Page.c"
 }
 
 
 gboolean page_on_shift_released (Page* self, GdkEventKey* event) {
-#line 774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 776 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 776 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_shift_released (self, event);
-#line 5920 "Page.c"
+#line 5938 "Page.c"
 }
 
 
 static gboolean page_real_on_super_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 781 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 781 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5930 "Page.c"
+#line 5948 "Page.c"
 }
 
 
 gboolean page_on_super_pressed (Page* self, GdkEventKey* event) {
-#line 778 "/home/jens/Source/shotwell/src/Page.vala"
+#line 780 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 778 "/home/jens/Source/shotwell/src/Page.vala"
+#line 780 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_super_pressed (self, event);
-#line 5939 "Page.c"
+#line 5957 "Page.c"
 }
 
 
 static gboolean page_real_on_super_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 785 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 785 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5949 "Page.c"
+#line 5967 "Page.c"
 }
 
 
 gboolean page_on_super_released (Page* self, GdkEventKey* event) {
-#line 782 "/home/jens/Source/shotwell/src/Page.vala"
+#line 784 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 782 "/home/jens/Source/shotwell/src/Page.vala"
+#line 784 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_super_released (self, event);
-#line 5958 "Page.c"
+#line 5976 "Page.c"
 }
 
 
 static gboolean page_real_on_app_key_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 788 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 789 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 789 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5970 "Page.c"
+#line 5988 "Page.c"
 }
 
 
 gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event) {
-#line 786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 788 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 788 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_app_key_pressed (self, event);
-#line 5979 "Page.c"
+#line 5997 "Page.c"
 }
 
 
 static gboolean page_real_on_app_key_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 792 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 793 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 793 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5991 "Page.c"
+#line 6009 "Page.c"
 }
 
 
 gboolean page_on_app_key_released (Page* self, GdkEventKey* event) {
-#line 790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 792 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 792 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_app_key_released (self, event);
-#line 6000 "Page.c"
+#line 6018 "Page.c"
 }
 
 
@@ -6015,248 +6033,248 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
 	GQuark _tmp9_ = 0U;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label1 = 0;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label2 = 0;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label3 = 0;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label4 = 0;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label5 = 0;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label6 = 0;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label7 = 0;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label8 = 0;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
-#line 6039 "Page.c"
+#line 6057 "Page.c"
 	GdkEventKey* _tmp30_ = NULL;
 	gboolean _tmp31_ = FALSE;
-#line 794 "/home/jens/Source/shotwell/src/Page.vala"
+#line 796 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 794 "/home/jens/Source/shotwell/src/Page.vala"
+#line 796 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 799 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 799 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 799 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 799 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 799 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->keyval;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gdk_keyval_name (_tmp5_);
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_);
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp9_ == ((0 != _tmp8_label0) ? _tmp8_label0 : (_tmp8_label0 = g_quark_from_static_string ("Control_L")))) || (_tmp9_ == ((0 != _tmp8_label1) ? _tmp8_label1 : (_tmp8_label1 = g_quark_from_static_string ("Control_R"))))) {
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6070 "Page.c"
+#line 6088 "Page.c"
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
 				gboolean _tmp11_ = FALSE;
 				GdkEventKey* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
-#line 803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 805 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
-#line 803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 805 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp11_) {
-#line 803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 805 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = TRUE;
-#line 6083 "Page.c"
+#line 6101 "Page.c"
 				} else {
 					gboolean _tmp12_ = FALSE;
-#line 803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 805 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
-#line 803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 805 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = _tmp12_;
-#line 6090 "Page.c"
+#line 6108 "Page.c"
 				}
-#line 803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 805 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp10_) {
-#line 804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6098 "Page.c"
+#line 6116 "Page.c"
 				}
-#line 806 "/home/jens/Source/shotwell/src/Page.vala"
-				self->priv->ctrl_pressed = TRUE;
 #line 808 "/home/jens/Source/shotwell/src/Page.vala"
+				self->priv->ctrl_pressed = TRUE;
+#line 810 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = event;
-#line 808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 810 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = page_on_ctrl_pressed (self, _tmp13_);
-#line 808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 810 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp14_;
-#line 808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 810 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6110 "Page.c"
+#line 6128 "Page.c"
 			}
 		}
 	} else if ((((_tmp9_ == ((0 != _tmp8_label2) ? _tmp8_label2 : (_tmp8_label2 = g_quark_from_static_string ("Meta_L")))) || (_tmp9_ == ((0 != _tmp8_label3) ? _tmp8_label3 : (_tmp8_label3 = g_quark_from_static_string ("Meta_R"))))) || (_tmp9_ == ((0 != _tmp8_label4) ? _tmp8_label4 : (_tmp8_label4 = g_quark_from_static_string ("Alt_L"))))) || (_tmp9_ == ((0 != _tmp8_label5) ? _tmp8_label5 : (_tmp8_label5 = g_quark_from_static_string ("Alt_R"))))) {
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6116 "Page.c"
+#line 6134 "Page.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
 				gboolean _tmp16_ = FALSE;
 				GdkEventKey* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 816 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 816 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp16_) {
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 816 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = TRUE;
-#line 6129 "Page.c"
+#line 6147 "Page.c"
 				} else {
 					gboolean _tmp17_ = FALSE;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 816 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 816 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = _tmp17_;
-#line 6136 "Page.c"
+#line 6154 "Page.c"
 				}
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 816 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp15_) {
-#line 815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6144 "Page.c"
+#line 6162 "Page.c"
 				}
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
-				self->priv->alt_pressed = TRUE;
 #line 819 "/home/jens/Source/shotwell/src/Page.vala"
+				self->priv->alt_pressed = TRUE;
+#line 821 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = event;
-#line 819 "/home/jens/Source/shotwell/src/Page.vala"
+#line 821 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_on_alt_pressed (self, _tmp18_);
-#line 819 "/home/jens/Source/shotwell/src/Page.vala"
+#line 821 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp19_;
-#line 819 "/home/jens/Source/shotwell/src/Page.vala"
+#line 821 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6156 "Page.c"
+#line 6174 "Page.c"
 			}
 		}
 	} else if ((_tmp9_ == ((0 != _tmp8_label6) ? _tmp8_label6 : (_tmp8_label6 = g_quark_from_static_string ("Shift_L")))) || (_tmp9_ == ((0 != _tmp8_label7) ? _tmp8_label7 : (_tmp8_label7 = g_quark_from_static_string ("Shift_R"))))) {
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6162 "Page.c"
+#line 6180 "Page.c"
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
 				gboolean _tmp21_ = FALSE;
 				GdkEventKey* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 825 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
-#line 823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 825 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp21_) {
-#line 823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 825 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = TRUE;
-#line 6175 "Page.c"
+#line 6193 "Page.c"
 				} else {
 					gboolean _tmp22_ = FALSE;
-#line 823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 825 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
-#line 823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 825 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = _tmp22_;
-#line 6182 "Page.c"
+#line 6200 "Page.c"
 				}
-#line 823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 825 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp20_) {
-#line 824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 826 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 826 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6190 "Page.c"
+#line 6208 "Page.c"
 				}
-#line 826 "/home/jens/Source/shotwell/src/Page.vala"
-				self->priv->shift_pressed = TRUE;
 #line 828 "/home/jens/Source/shotwell/src/Page.vala"
+				self->priv->shift_pressed = TRUE;
+#line 830 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = event;
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 830 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = page_on_shift_pressed (self, _tmp23_);
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 830 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp24_;
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 830 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6202 "Page.c"
+#line 6220 "Page.c"
 			}
 		}
 	} else if ((_tmp9_ == ((0 != _tmp8_label8) ? _tmp8_label8 : (_tmp8_label8 = g_quark_from_static_string ("Super_L")))) || (_tmp9_ == ((0 != _tmp8_label9) ? _tmp8_label9 : (_tmp8_label9 = g_quark_from_static_string ("Super_R"))))) {
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6208 "Page.c"
+#line 6226 "Page.c"
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
 				gboolean _tmp26_ = FALSE;
 				GdkEventKey* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
-#line 832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
-#line 832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp26_) {
-#line 832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = TRUE;
-#line 6221 "Page.c"
+#line 6239 "Page.c"
 				} else {
 					gboolean _tmp27_ = FALSE;
-#line 832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
-#line 832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = _tmp27_;
-#line 6228 "Page.c"
+#line 6246 "Page.c"
 				}
-#line 832 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp25_) {
-#line 833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 835 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 835 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6236 "Page.c"
+#line 6254 "Page.c"
 				}
-#line 835 "/home/jens/Source/shotwell/src/Page.vala"
-				self->priv->super_pressed = TRUE;
 #line 837 "/home/jens/Source/shotwell/src/Page.vala"
+				self->priv->super_pressed = TRUE;
+#line 839 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = event;
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 839 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = page_on_super_pressed (self, _tmp28_);
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 839 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp29_;
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 839 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6248 "Page.c"
+#line 6266 "Page.c"
 			}
 		}
 	}
-#line 840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 842 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = event;
-#line 840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 842 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = page_on_app_key_pressed (self, _tmp30_);
-#line 840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 842 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp31_;
-#line 840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 842 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6260 "Page.c"
+#line 6278 "Page.c"
 }
 
 
@@ -6275,406 +6293,406 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
 	GQuark _tmp9_ = 0U;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label1 = 0;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label2 = 0;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label3 = 0;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label4 = 0;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label5 = 0;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label6 = 0;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label7 = 0;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label8 = 0;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
-#line 6299 "Page.c"
+#line 6317 "Page.c"
 	GdkEventKey* _tmp30_ = NULL;
 	gboolean _tmp31_ = FALSE;
-#line 843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 845 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 845 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 848 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 848 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 848 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 848 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 848 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->keyval;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gdk_keyval_name (_tmp5_);
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_);
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp9_ == ((0 != _tmp8_label0) ? _tmp8_label0 : (_tmp8_label0 = g_quark_from_static_string ("Control_L")))) || (_tmp9_ == ((0 != _tmp8_label1) ? _tmp8_label1 : (_tmp8_label1 = g_quark_from_static_string ("Control_R"))))) {
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6330 "Page.c"
+#line 6348 "Page.c"
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
 				gboolean _tmp11_ = FALSE;
 				GdkEventKey* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
-#line 852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 854 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
-#line 852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 854 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp11_) {
-#line 852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 854 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = TRUE;
-#line 6343 "Page.c"
+#line 6361 "Page.c"
 				} else {
 					gboolean _tmp12_ = FALSE;
-#line 852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 854 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
-#line 852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 854 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = !_tmp12_;
-#line 6350 "Page.c"
+#line 6368 "Page.c"
 				}
-#line 852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 854 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp10_) {
-#line 853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 855 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 855 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6358 "Page.c"
+#line 6376 "Page.c"
 				}
-#line 855 "/home/jens/Source/shotwell/src/Page.vala"
-				self->priv->ctrl_pressed = FALSE;
 #line 857 "/home/jens/Source/shotwell/src/Page.vala"
+				self->priv->ctrl_pressed = FALSE;
+#line 859 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = event;
-#line 857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 859 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = page_on_ctrl_released (self, _tmp13_);
-#line 857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 859 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp14_;
-#line 857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 859 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6370 "Page.c"
+#line 6388 "Page.c"
 			}
 		}
 	} else if ((((_tmp9_ == ((0 != _tmp8_label2) ? _tmp8_label2 : (_tmp8_label2 = g_quark_from_static_string ("Meta_L")))) || (_tmp9_ == ((0 != _tmp8_label3) ? _tmp8_label3 : (_tmp8_label3 = g_quark_from_static_string ("Meta_R"))))) || (_tmp9_ == ((0 != _tmp8_label4) ? _tmp8_label4 : (_tmp8_label4 = g_quark_from_static_string ("Alt_L"))))) || (_tmp9_ == ((0 != _tmp8_label5) ? _tmp8_label5 : (_tmp8_label5 = g_quark_from_static_string ("Alt_R"))))) {
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6376 "Page.c"
+#line 6394 "Page.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
 				gboolean _tmp16_ = FALSE;
 				GdkEventKey* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 865 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 865 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp16_) {
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 865 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = TRUE;
-#line 6389 "Page.c"
+#line 6407 "Page.c"
 				} else {
 					gboolean _tmp17_ = FALSE;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 865 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 865 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = !_tmp17_;
-#line 6396 "Page.c"
+#line 6414 "Page.c"
 				}
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 865 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp15_) {
-#line 864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6404 "Page.c"
+#line 6422 "Page.c"
 				}
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
-				self->priv->alt_pressed = FALSE;
 #line 868 "/home/jens/Source/shotwell/src/Page.vala"
+				self->priv->alt_pressed = FALSE;
+#line 870 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = event;
-#line 868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 870 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_on_alt_released (self, _tmp18_);
-#line 868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 870 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp19_;
-#line 868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 870 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6416 "Page.c"
+#line 6434 "Page.c"
 			}
 		}
 	} else if ((_tmp9_ == ((0 != _tmp8_label6) ? _tmp8_label6 : (_tmp8_label6 = g_quark_from_static_string ("Shift_L")))) || (_tmp9_ == ((0 != _tmp8_label7) ? _tmp8_label7 : (_tmp8_label7 = g_quark_from_static_string ("Shift_R"))))) {
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6422 "Page.c"
+#line 6440 "Page.c"
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
 				gboolean _tmp21_ = FALSE;
 				GdkEventKey* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 874 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
-#line 872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 874 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp21_) {
-#line 872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 874 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = TRUE;
-#line 6435 "Page.c"
+#line 6453 "Page.c"
 				} else {
 					gboolean _tmp22_ = FALSE;
-#line 872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 874 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
-#line 872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 874 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = !_tmp22_;
-#line 6442 "Page.c"
+#line 6460 "Page.c"
 				}
-#line 872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 874 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp20_) {
-#line 873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 875 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 875 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6450 "Page.c"
+#line 6468 "Page.c"
 				}
-#line 875 "/home/jens/Source/shotwell/src/Page.vala"
-				self->priv->shift_pressed = FALSE;
 #line 877 "/home/jens/Source/shotwell/src/Page.vala"
+				self->priv->shift_pressed = FALSE;
+#line 879 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = event;
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 879 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = page_on_shift_released (self, _tmp23_);
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 879 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp24_;
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 879 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6462 "Page.c"
+#line 6480 "Page.c"
 			}
 		}
 	} else if ((_tmp9_ == ((0 != _tmp8_label8) ? _tmp8_label8 : (_tmp8_label8 = g_quark_from_static_string ("Super_L")))) || (_tmp9_ == ((0 != _tmp8_label9) ? _tmp8_label9 : (_tmp8_label9 = g_quark_from_static_string ("Super_R"))))) {
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 851 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6468 "Page.c"
+#line 6486 "Page.c"
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
 				gboolean _tmp26_ = FALSE;
 				GdkEventKey* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
-#line 881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
-#line 881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp26_) {
-#line 881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = TRUE;
-#line 6481 "Page.c"
+#line 6499 "Page.c"
 				} else {
 					gboolean _tmp27_ = FALSE;
-#line 881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
-#line 881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = !_tmp27_;
-#line 6488 "Page.c"
+#line 6506 "Page.c"
 				}
-#line 881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp25_) {
-#line 882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 884 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 884 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6496 "Page.c"
+#line 6514 "Page.c"
 				}
-#line 884 "/home/jens/Source/shotwell/src/Page.vala"
-				self->priv->super_pressed = FALSE;
 #line 886 "/home/jens/Source/shotwell/src/Page.vala"
+				self->priv->super_pressed = FALSE;
+#line 888 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = event;
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 888 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = page_on_super_released (self, _tmp28_);
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 888 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp29_;
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 888 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6508 "Page.c"
+#line 6526 "Page.c"
 			}
 		}
 	}
-#line 889 "/home/jens/Source/shotwell/src/Page.vala"
+#line 891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = event;
-#line 889 "/home/jens/Source/shotwell/src/Page.vala"
+#line 891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = page_on_app_key_released (self, _tmp30_);
-#line 889 "/home/jens/Source/shotwell/src/Page.vala"
+#line 891 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp31_;
-#line 889 "/home/jens/Source/shotwell/src/Page.vala"
+#line 891 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6520 "Page.c"
+#line 6538 "Page.c"
 }
 
 
 gboolean page_notify_app_focus_in (Page* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 894 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 894 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 893 "/home/jens/Source/shotwell/src/Page.vala"
-	page_update_modifiers (self);
 #line 895 "/home/jens/Source/shotwell/src/Page.vala"
+	page_update_modifiers (self);
+#line 897 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 897 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6536 "Page.c"
+#line 6554 "Page.c"
 }
 
 
 gboolean page_notify_app_focus_out (Page* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 900 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 900 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6550 "Page.c"
+#line 6568 "Page.c"
 }
 
 
 static void page_real_on_move (Page* self, GdkRectangle* rect) {
-#line 902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 904 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6557 "Page.c"
+#line 6575 "Page.c"
 }
 
 
 void page_on_move (Page* self, GdkRectangle* rect) {
-#line 902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 904 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 904 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move (self, rect);
-#line 6566 "Page.c"
+#line 6584 "Page.c"
 }
 
 
 static void page_real_on_move_start (Page* self, GdkRectangle* rect) {
-#line 905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 907 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6573 "Page.c"
+#line 6591 "Page.c"
 }
 
 
 void page_on_move_start (Page* self, GdkRectangle* rect) {
-#line 905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 907 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 907 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move_start (self, rect);
-#line 6582 "Page.c"
+#line 6600 "Page.c"
 }
 
 
 static void page_real_on_move_finished (Page* self, GdkRectangle* rect) {
-#line 908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 910 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6589 "Page.c"
+#line 6607 "Page.c"
 }
 
 
 void page_on_move_finished (Page* self, GdkRectangle* rect) {
-#line 908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 910 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 910 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move_finished (self, rect);
-#line 6598 "Page.c"
+#line 6616 "Page.c"
 }
 
 
 static void page_real_on_resize (Page* self, GdkRectangle* rect) {
-#line 911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 913 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6605 "Page.c"
+#line 6623 "Page.c"
 }
 
 
 void page_on_resize (Page* self, GdkRectangle* rect) {
-#line 911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 913 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 913 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize (self, rect);
-#line 6614 "Page.c"
+#line 6632 "Page.c"
 }
 
 
 static void page_real_on_resize_start (Page* self, GdkRectangle* rect) {
-#line 914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 916 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6621 "Page.c"
+#line 6639 "Page.c"
 }
 
 
 void page_on_resize_start (Page* self, GdkRectangle* rect) {
-#line 914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 916 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 916 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize_start (self, rect);
-#line 6630 "Page.c"
+#line 6648 "Page.c"
 }
 
 
 static void page_real_on_resize_finished (Page* self, GdkRectangle* rect) {
-#line 917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 919 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6637 "Page.c"
+#line 6655 "Page.c"
 }
 
 
 void page_on_resize_finished (Page* self, GdkRectangle* rect) {
-#line 917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 919 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 919 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize_finished (self, rect);
-#line 6646 "Page.c"
+#line 6664 "Page.c"
 }
 
 
 static gboolean page_real_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) {
 	gboolean result = FALSE;
-#line 920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 922 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 922 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (rect != NULL, FALSE);
-#line 921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 923 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 923 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6660 "Page.c"
+#line 6678 "Page.c"
 }
 
 
 gboolean page_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) {
-#line 920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 922 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 922 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_configure (self, event, rect);
-#line 6669 "Page.c"
+#line 6687 "Page.c"
 }
 
 
 static gboolean _page_check_configure_halted_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_check_configure_halted ((Page*) self);
-#line 945 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6678 "Page.c"
+#line 6696 "Page.c"
 }
 
 
@@ -6705,41 +6723,41 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 	GdkEventConfigure* _tmp51_ = NULL;
 	GdkRectangle _tmp52_ = {0};
 	gboolean _tmp53_ = FALSE;
-#line 924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 926 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 926 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 927 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&rect, 0, sizeof (GdkRectangle));
-#line 926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->x;
-#line 926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.x = _tmp1_;
-#line 927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 929 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 929 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->y;
-#line 927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 929 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.y = _tmp3_;
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 930 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 930 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->width;
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 930 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.width = _tmp5_;
-#line 929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 931 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = event;
-#line 929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 931 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_->height;
-#line 929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 931 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.height = _tmp7_;
-#line 932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->last_configure_ms;
-#line 932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_ == ((gulong) 0)) {
-#line 6743 "Page.c"
+#line 6761 "Page.c"
 		gboolean _tmp9_ = FALSE;
 		GdkRectangle _tmp10_ = {0};
 		gint _tmp11_ = 0;
@@ -6750,193 +6768,193 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 		gint _tmp21_ = 0;
 		GdkRectangle _tmp22_ = {0};
 		gint _tmp23_ = 0;
-#line 933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->last_position;
-#line 933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_.x;
-#line 933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = rect;
-#line 933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_.x;
-#line 933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp11_ != _tmp13_) {
-#line 933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = TRUE;
-#line 6766 "Page.c"
+#line 6784 "Page.c"
 		} else {
 			GdkRectangle _tmp14_ = {0};
 			gint _tmp15_ = 0;
 			GdkRectangle _tmp16_ = {0};
 			gint _tmp17_ = 0;
-#line 933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->priv->last_position;
-#line 933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _tmp14_.y;
-#line 933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = rect;
-#line 933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = _tmp16_.y;
-#line 933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = _tmp15_ != _tmp17_;
-#line 6782 "Page.c"
+#line 6800 "Page.c"
 		}
-#line 933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp9_) {
-#line 6786 "Page.c"
+#line 6804 "Page.c"
 			GdkRectangle _tmp18_ = {0};
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 936 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = rect;
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 936 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_move_start (self, &_tmp18_);
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 937 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->report_move_finished = TRUE;
-#line 6794 "Page.c"
+#line 6812 "Page.c"
 		}
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->last_position;
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = _tmp20_.width;
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = rect;
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _tmp22_.width;
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_ != _tmp23_) {
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = TRUE;
-#line 6808 "Page.c"
+#line 6826 "Page.c"
 		} else {
 			GdkRectangle _tmp24_ = {0};
 			gint _tmp25_ = 0;
 			GdkRectangle _tmp26_ = {0};
 			gint _tmp27_ = 0;
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = self->priv->last_position;
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = _tmp24_.height;
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = rect;
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = _tmp26_.height;
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = _tmp25_ != _tmp27_;
-#line 6824 "Page.c"
+#line 6842 "Page.c"
 		}
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp19_) {
-#line 6828 "Page.c"
+#line 6846 "Page.c"
 			GdkRectangle _tmp28_ = {0};
-#line 939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 941 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = rect;
-#line 939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 941 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_resize_start (self, &_tmp28_);
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->report_resize_finished = TRUE;
-#line 6836 "Page.c"
+#line 6854 "Page.c"
 		}
-#line 945 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) (PAGE_CONSIDER_CONFIGURE_HALTED_MSEC / 8), _page_check_configure_halted_gsource_func, g_object_ref (self), g_object_unref);
-#line 6840 "Page.c"
+#line 6858 "Page.c"
 	}
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 950 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = self->priv->last_position;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 950 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = _tmp30_.x;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 950 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp32_ = rect;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 950 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp33_ = _tmp32_.x;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 950 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp31_ != _tmp33_) {
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 950 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = TRUE;
-#line 6854 "Page.c"
+#line 6872 "Page.c"
 	} else {
 		GdkRectangle _tmp34_ = {0};
 		gint _tmp35_ = 0;
 		GdkRectangle _tmp36_ = {0};
 		gint _tmp37_ = 0;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 950 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = self->priv->last_position;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 950 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp35_ = _tmp34_.y;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 950 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp36_ = rect;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 950 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp37_ = _tmp36_.y;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 950 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp35_ != _tmp37_;
-#line 6870 "Page.c"
+#line 6888 "Page.c"
 	}
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 950 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
-#line 6874 "Page.c"
+#line 6892 "Page.c"
 		GdkRectangle _tmp38_ = {0};
-#line 949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = rect;
-#line 949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_move (self, &_tmp38_);
-#line 6880 "Page.c"
+#line 6898 "Page.c"
 	}
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = self->priv->last_position;
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = _tmp40_.width;
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = rect;
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp43_ = _tmp42_.width;
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp41_ != _tmp43_) {
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp39_ = TRUE;
-#line 6894 "Page.c"
+#line 6912 "Page.c"
 	} else {
 		GdkRectangle _tmp44_ = {0};
 		gint _tmp45_ = 0;
 		GdkRectangle _tmp46_ = {0};
 		gint _tmp47_ = 0;
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = self->priv->last_position;
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp45_ = _tmp44_.height;
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = rect;
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = _tmp46_.height;
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp39_ = _tmp45_ != _tmp47_;
-#line 6910 "Page.c"
+#line 6928 "Page.c"
 	}
-#line 951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp39_) {
-#line 6914 "Page.c"
+#line 6932 "Page.c"
 		GdkRectangle _tmp48_ = {0};
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 954 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = rect;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 954 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_resize (self, &_tmp48_);
-#line 6920 "Page.c"
+#line 6938 "Page.c"
 	}
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 956 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = rect;
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 956 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_position = _tmp49_;
-#line 955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp50_ = now_ms ();
-#line 955 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->last_configure_ms = _tmp50_;
 #line 957 "/home/jens/Source/shotwell/src/Page.vala"
+	self->priv->last_configure_ms = _tmp50_;
+#line 959 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp51_ = event;
-#line 957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 959 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp52_ = rect;
-#line 957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 959 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp53_ = page_on_configure (self, _tmp51_, &_tmp52_);
-#line 957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 959 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp53_;
-#line 957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 959 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6940 "Page.c"
+#line 6958 "Page.c"
 }
 
 
@@ -6949,117 +6967,117 @@ static gboolean page_check_configure_halted (Page* self) {
 	GtkAllocation _tmp3_ = {0};
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 961 "/home/jens/Source/shotwell/src/Page.vala"
+#line 963 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 961 "/home/jens/Source/shotwell/src/Page.vala"
+#line 963 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 964 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 964 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 6963 "Page.c"
+#line 6981 "Page.c"
 	}
-#line 964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 966 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = now_ms ();
-#line 964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 966 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->last_configure_ms;
-#line 964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 966 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp1_ - _tmp2_) < ((gulong) PAGE_CONSIDER_CONFIGURE_HALTED_MSEC)) {
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 967 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 967 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 6975 "Page.c"
+#line 6993 "Page.c"
 	}
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 970 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp3_);
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
-	allocation = _tmp3_;
 #line 970 "/home/jens/Source/shotwell/src/Page.vala"
+	allocation = _tmp3_;
+#line 972 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->report_move_finished;
-#line 970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 972 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 6985 "Page.c"
+#line 7003 "Page.c"
 		GtkAllocation _tmp5_ = {0};
 		GdkRectangle _tmp6_ = {0};
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 973 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = allocation;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 973 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GdkRectangle) _tmp5_;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 973 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_move_finished (self, &_tmp6_);
-#line 6994 "Page.c"
+#line 7012 "Page.c"
 	}
-#line 973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 975 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->report_resize_finished;
-#line 973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 975 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_) {
-#line 7000 "Page.c"
+#line 7018 "Page.c"
 		GtkAllocation _tmp8_ = {0};
 		GdkRectangle _tmp9_ = {0};
-#line 974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 976 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = allocation;
-#line 974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 976 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = (GdkRectangle) _tmp8_;
-#line 974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 976 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_resize_finished (self, &_tmp9_);
-#line 7009 "Page.c"
+#line 7027 "Page.c"
 	}
-#line 976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 978 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_configure_ms = (gulong) 0;
-#line 977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 979 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_move_finished = FALSE;
-#line 978 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->report_resize_finished = FALSE;
 #line 980 "/home/jens/Source/shotwell/src/Page.vala"
+	self->priv->report_resize_finished = FALSE;
+#line 982 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 980 "/home/jens/Source/shotwell/src/Page.vala"
+#line 982 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7021 "Page.c"
+#line 7039 "Page.c"
 }
 
 
 static gboolean page_real_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
 	gboolean result = FALSE;
-#line 983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 985 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 984 "/home/jens/Source/shotwell/src/Page.vala"
-	page_check_cursor_hiding (self);
 #line 986 "/home/jens/Source/shotwell/src/Page.vala"
+	page_check_cursor_hiding (self);
+#line 988 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 988 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7035 "Page.c"
+#line 7053 "Page.c"
 }
 
 
 gboolean page_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
-#line 983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 985 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 985 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_motion (self, event, x, y, mask);
-#line 7044 "Page.c"
+#line 7062 "Page.c"
 }
 
 
 static gboolean page_real_on_leave_notify_event (Page* self) {
 	gboolean result = FALSE;
-#line 990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 992 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 992 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7054 "Page.c"
+#line 7072 "Page.c"
 }
 
 
 gboolean page_on_leave_notify_event (Page* self) {
-#line 989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 991 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 991 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_leave_notify_event (self);
-#line 7063 "Page.c"
+#line 7081 "Page.c"
 }
 
 
@@ -7075,29 +7093,29 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 	gint _tmp13_ = 0;
 	GdkModifierType _tmp14_ = 0;
 	gboolean _tmp15_ = FALSE;
-#line 993 "/home/jens/Source/shotwell/src/Page.vala"
+#line 995 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 993 "/home/jens/Source/shotwell/src/Page.vala"
+#line 995 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 998 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 998 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->is_hint;
-#line 996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 998 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((gint) _tmp1_) == 1) {
-#line 7089 "Page.c"
+#line 7107 "Page.c"
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		GdkModifierType _tmp4_ = 0;
-#line 997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 999 "/home/jens/Source/shotwell/src/Page.vala"
 		page_get_event_source_pointer (self, &_tmp2_, &_tmp3_, &_tmp4_);
-#line 997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 999 "/home/jens/Source/shotwell/src/Page.vala"
 		x = _tmp2_;
-#line 997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 999 "/home/jens/Source/shotwell/src/Page.vala"
 		y = _tmp3_;
-#line 997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 999 "/home/jens/Source/shotwell/src/Page.vala"
 		mask = _tmp4_;
-#line 7101 "Page.c"
+#line 7119 "Page.c"
 	} else {
 		GdkEventMotion* _tmp5_ = NULL;
 		gdouble _tmp6_ = 0.0;
@@ -7105,41 +7123,41 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 		gdouble _tmp8_ = 0.0;
 		GdkEventMotion* _tmp9_ = NULL;
 		GdkModifierType _tmp10_ = 0;
-#line 999 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = event;
-#line 999 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_->x;
-#line 999 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
 		x = (gint) _tmp6_;
-#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = event;
-#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->y;
-#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Page.vala"
 		y = (gint) _tmp8_;
-#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = event;
-#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_->state;
-#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
 		mask = _tmp10_;
-#line 7127 "Page.c"
+#line 7145 "Page.c"
 	}
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = event;
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = x;
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = y;
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = mask;
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_on_motion (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp15_;
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7143 "Page.c"
+#line 7161 "Page.c"
 }
 
 
@@ -7147,87 +7165,87 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 	gboolean result = FALSE;
 	GdkEventScroll* _tmp0_ = NULL;
 	GdkScrollDirection _tmp1_ = 0;
-#line 1007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->direction;
-#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_UP:
-#line 7163 "Page.c"
+#line 7181 "Page.c"
 		{
 			GdkEventScroll* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = event;
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = page_on_mousewheel_up (self, _tmp2_);
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp3_;
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7175 "Page.c"
+#line 7193 "Page.c"
 		}
-#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_DOWN:
-#line 7179 "Page.c"
+#line 7197 "Page.c"
 		{
 			GdkEventScroll* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
-#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = event;
-#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = page_on_mousewheel_down (self, _tmp4_);
-#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp5_;
-#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7191 "Page.c"
+#line 7209 "Page.c"
 		}
-#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_LEFT:
-#line 7195 "Page.c"
+#line 7213 "Page.c"
 		{
 			GdkEventScroll* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
-#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = event;
-#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = page_on_mousewheel_left (self, _tmp6_);
-#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp7_;
-#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7207 "Page.c"
+#line 7225 "Page.c"
 		}
-#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_RIGHT:
-#line 7211 "Page.c"
+#line 7229 "Page.c"
 		{
 			GdkEventScroll* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = event;
-#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = page_on_mousewheel_right (self, _tmp8_);
-#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp9_;
-#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7223 "Page.c"
+#line 7241 "Page.c"
 		}
 		default:
 		{
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7231 "Page.c"
+#line 7249 "Page.c"
 		}
 	}
 }
@@ -7235,144 +7253,144 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 
 static gboolean page_real_on_mousewheel_up (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1026 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1029 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1029 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7245 "Page.c"
+#line 7263 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_up (Page* self, GdkEventScroll* event) {
-#line 1026 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1026 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_up (self, event);
-#line 7254 "Page.c"
+#line 7272 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_down (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1031 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1031 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7266 "Page.c"
+#line 7284 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_down (Page* self, GdkEventScroll* event) {
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_down (self, event);
-#line 7275 "Page.c"
+#line 7293 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_left (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1034 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7287 "Page.c"
+#line 7305 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_left (Page* self, GdkEventScroll* event) {
-#line 1034 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1034 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_left (self, event);
-#line 7296 "Page.c"
+#line 7314 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_right (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1038 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7308 "Page.c"
+#line 7326 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_right (Page* self, GdkEventScroll* event) {
-#line 1038 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1038 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_right (self, event);
-#line 7317 "Page.c"
+#line 7335 "Page.c"
 }
 
 
 static gboolean page_real_on_context_keypress (Page* self) {
 	gboolean result = FALSE;
-#line 1043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1043 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7327 "Page.c"
+#line 7345 "Page.c"
 }
 
 
 gboolean page_on_context_keypress (Page* self) {
-#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_keypress (self);
-#line 7336 "Page.c"
+#line 7354 "Page.c"
 }
 
 
 static gboolean page_real_on_context_buttonpress (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7348 "Page.c"
+#line 7366 "Page.c"
 }
 
 
 gboolean page_on_context_buttonpress (Page* self, GdkEventButton* event) {
-#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_buttonpress (self, event);
-#line 7357 "Page.c"
+#line 7375 "Page.c"
 }
 
 
 static gboolean page_real_on_context_invoked (Page* self) {
 	gboolean result = FALSE;
-#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7367 "Page.c"
+#line 7385 "Page.c"
 }
 
 
 gboolean page_on_context_invoked (Page* self) {
-#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_invoked (self);
-#line 7376 "Page.c"
+#line 7394 "Page.c"
 }
 
 
@@ -7381,72 +7399,72 @@ gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventBut
 	gboolean _tmp0_ = FALSE;
 	GtkMenu* _tmp1_ = NULL;
 	GdkEventButton* _tmp3_ = NULL;
-#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((context_menu == NULL) || GTK_IS_MENU (context_menu), FALSE);
-#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = context_menu;
-#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 7395 "Page.c"
+#line 7413 "Page.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = page_on_context_invoked (self);
-#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 7402 "Page.c"
+#line 7420 "Page.c"
 	}
-#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7410 "Page.c"
+#line 7428 "Page.c"
 	}
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
-#line 7416 "Page.c"
+#line 7434 "Page.c"
 		GtkMenu* _tmp4_ = NULL;
 		guint32 _tmp5_ = 0U;
-#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = context_menu;
-#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_get_current_event_time ();
-#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp4_, NULL, NULL, NULL, NULL, (guint) 0, _tmp5_);
-#line 7425 "Page.c"
+#line 7443 "Page.c"
 	} else {
 		GtkMenu* _tmp6_ = NULL;
 		GdkEventButton* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
 		GdkEventButton* _tmp9_ = NULL;
 		guint32 _tmp10_ = 0U;
-#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = context_menu;
-#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = event;
-#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->button;
-#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = event;
-#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_->time;
-#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp6_, NULL, NULL, NULL, NULL, _tmp8_, _tmp10_);
-#line 7444 "Page.c"
+#line 7462 "Page.c"
 	}
-#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1067 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1067 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7450 "Page.c"
+#line 7468 "Page.c"
 }
 
 
@@ -7461,166 +7479,166 @@ void page_on_event_source_realize (Page* self) {
 	GdkWindow* _tmp10_ = NULL;
 	GdkWindow* _tmp11_ = NULL;
 	GdkWindow* _tmp20_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1070 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1069 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1069 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (_tmp0_);
-#line 1069 "/home/jens/Source/shotwell/src/Page.vala"
-	_vala_assert (_tmp1_ != NULL, "event_source.get_window() != null");
 #line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+	_vala_assert (_tmp1_ != NULL, "event_source.get_window() != null");
+#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gtk_widget_get_window (_tmp2_);
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_window_get_cursor (_tmp3_);
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 7481 "Page.c"
+#line 7499 "Page.c"
 		GtkWidget* _tmp5_ = NULL;
 		GdkWindow* _tmp6_ = NULL;
 		GdkCursor* _tmp7_ = NULL;
 		GdkCursorType _tmp8_ = 0;
-#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_window_get_cursor (_tmp6_);
-#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gdk_cursor_get_cursor_type (_tmp7_);
-#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp8_;
-#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 7498 "Page.c"
+#line 7516 "Page.c"
 	}
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = gtk_widget_get_window (_tmp9_);
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
 	parent_window = _tmp11_;
-#line 7508 "Page.c"
+#line 7526 "Page.c"
 	{
 		gboolean _tmp12_ = FALSE;
-#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = TRUE;
-#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 7515 "Page.c"
+#line 7533 "Page.c"
 			GdkWindow* _tmp17_ = NULL;
 			GdkWindow* _tmp18_ = NULL;
 			GdkWindow* _tmp19_ = NULL;
-#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp12_) {
-#line 7521 "Page.c"
+#line 7539 "Page.c"
 				gboolean _tmp13_ = FALSE;
 				GdkWindow* _tmp14_ = NULL;
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = parent_window;
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp14_ != NULL) {
-#line 7528 "Page.c"
+#line 7546 "Page.c"
 					GdkWindow* _tmp15_ = NULL;
 					GdkCursor* _tmp16_ = NULL;
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = parent_window;
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = gdk_window_get_cursor (_tmp15_);
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = _tmp16_ == NULL;
-#line 7537 "Page.c"
+#line 7555 "Page.c"
 				} else {
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = FALSE;
-#line 7541 "Page.c"
+#line 7559 "Page.c"
 				}
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp13_) {
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 7547 "Page.c"
+#line 7565 "Page.c"
 				}
 			}
-#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = FALSE;
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = parent_window;
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = gdk_window_get_parent (_tmp17_);
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (parent_window);
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
 			parent_window = _tmp19_;
-#line 7562 "Page.c"
+#line 7580 "Page.c"
 		}
 	}
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = parent_window;
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != NULL) {
-#line 7569 "Page.c"
+#line 7587 "Page.c"
 		GdkWindow* _tmp21_ = NULL;
 		GdkCursor* _tmp22_ = NULL;
 		GdkCursorType _tmp23_ = 0;
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = parent_window;
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = gdk_window_get_cursor (_tmp21_);
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = gdk_cursor_get_cursor_type (_tmp22_);
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp23_;
-#line 7581 "Page.c"
+#line 7599 "Page.c"
 	}
-#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1070 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (parent_window);
-#line 7585 "Page.c"
+#line 7603 "Page.c"
 }
 
 
 void page_set_cursor_hide_time (Page* self, gint hide_time) {
 	gint _tmp0_ = 0;
-#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1087 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = hide_time;
-#line 1087 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 7597 "Page.c"
+#line 7615 "Page.c"
 }
 
 
 void page_start_cursor_hiding (Page* self) {
-#line 1090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7606 "Page.c"
+#line 7624 "Page.c"
 }
 
 
 void page_stop_cursor_hiding (Page* self) {
 	guint _tmp0_ = 0U;
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->last_timeout_id;
-#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 7618 "Page.c"
+#line 7636 "Page.c"
 		guint _tmp1_ = 0U;
-#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_timeout_id;
-#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp1_);
-#line 7624 "Page.c"
+#line 7642 "Page.c"
 	}
 }
 
@@ -7628,41 +7646,41 @@ void page_stop_cursor_hiding (Page* self) {
 void page_suspend_cursor_hiding (Page* self) {
 	gint _tmp0_ = 0;
 	guint _tmp1_ = 0U;
-#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_msec;
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->cursor_hide_time_cached = _tmp0_;
 #line 1102 "/home/jens/Source/shotwell/src/Page.vala"
+	self->priv->cursor_hide_time_cached = _tmp0_;
+#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->last_timeout_id;
-#line 1102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != ((guint) 0)) {
-#line 7642 "Page.c"
+#line 7660 "Page.c"
 		guint _tmp2_ = 0U;
-#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->last_timeout_id;
-#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp2_);
-#line 7648 "Page.c"
+#line 7666 "Page.c"
 	}
-#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = 0;
-#line 7652 "Page.c"
+#line 7670 "Page.c"
 }
 
 
 void page_restore_cursor_hiding (Page* self) {
 	gint _tmp0_ = 0;
-#line 1108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1111 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_time_cached;
-#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1111 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1112 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7666 "Page.c"
+#line 7684 "Page.c"
 }
 
 
@@ -7670,29 +7688,29 @@ static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type) {
 	GdkCursorType _tmp0_ = 0;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = cursor_type;
-#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->last_cursor = _tmp0_;
 #line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+	self->priv->last_cursor = _tmp0_;
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hidden;
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp2_) {
-#line 7682 "Page.c"
+#line 7700 "Page.c"
 		GtkWidget* _tmp3_ = NULL;
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 7688 "Page.c"
+#line 7706 "Page.c"
 	} else {
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = FALSE;
-#line 7692 "Page.c"
+#line 7710 "Page.c"
 	}
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 7696 "Page.c"
+#line 7714 "Page.c"
 		GdkDisplay* display = NULL;
 		GtkWidget* _tmp4_ = NULL;
 		GdkWindow* _tmp5_ = NULL;
@@ -7704,103 +7722,103 @@ static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type) {
 		GdkCursorType _tmp11_ = 0;
 		GdkCursor* _tmp12_ = NULL;
 		GdkCursor* _tmp13_ = NULL;
-#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = self->priv->event_source;
-#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_widget_get_window (_tmp4_);
-#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gdk_window_get_display (_tmp5_);
-#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
 		display = _tmp7_;
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->event_source;
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = gtk_widget_get_window (_tmp8_);
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = display;
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = cursor_type;
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = gdk_cursor_new_for_display (_tmp10_, _tmp11_);
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_;
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_set_cursor (_tmp9_, _tmp13_);
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp13_);
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (display);
-#line 7736 "Page.c"
+#line 7754 "Page.c"
 	}
 }
 
 
 void page_set_page_cursor (Page* self, GdkCursorType cursor_type) {
-#line 1114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_page_cursor (self, cursor_type);
-#line 7746 "Page.c"
+#line 7764 "Page.c"
 }
 
 
 static gboolean _page_on_hide_cursor_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_on_hide_cursor ((Page*) self);
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7755 "Page.c"
+#line 7773 "Page.c"
 }
 
 
 static void page_check_cursor_hiding (Page* self) {
 	gboolean _tmp0_ = FALSE;
 	gint _tmp2_ = 0;
-#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1126 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hidden;
-#line 1124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1126 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 7768 "Page.c"
+#line 7786 "Page.c"
 		GdkCursorType _tmp1_ = 0;
-#line 1125 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1127 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->cursor_hidden = FALSE;
-#line 1126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_cursor;
-#line 1126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
 		page_set_page_cursor (self, _tmp1_);
-#line 7776 "Page.c"
+#line 7794 "Page.c"
 	}
-#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hide_msec;
-#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != 0) {
-#line 7782 "Page.c"
+#line 7800 "Page.c"
 		guint _tmp3_ = 0U;
 		gint _tmp5_ = 0;
 		guint _tmp6_ = 0U;
-#line 1130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->last_timeout_id;
-#line 1130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp3_ != ((guint) 0)) {
-#line 7790 "Page.c"
+#line 7808 "Page.c"
 			guint _tmp4_ = 0U;
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = self->priv->last_timeout_id;
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
 			g_source_remove (_tmp4_);
-#line 7796 "Page.c"
+#line 7814 "Page.c"
 		}
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->cursor_hide_msec;
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp5_, _page_on_hide_cursor_gsource_func, g_object_ref (self), g_object_unref);
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_timeout_id = _tmp6_;
-#line 7804 "Page.c"
+#line 7822 "Page.c"
 	}
 }
 
@@ -7808,15 +7826,15 @@ static void page_check_cursor_hiding (Page* self) {
 static gboolean page_on_hide_cursor (Page* self) {
 	gboolean result = FALSE;
 	GtkWidget* _tmp0_ = NULL;
-#line 1136 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->cursor_hidden = TRUE;
 #line 1139 "/home/jens/Source/shotwell/src/Page.vala"
+	self->priv->cursor_hidden = TRUE;
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 7820 "Page.c"
+#line 7838 "Page.c"
 		GdkDisplay* display = NULL;
 		GtkWidget* _tmp1_ = NULL;
 		GdkWindow* _tmp2_ = NULL;
@@ -7827,404 +7845,68 @@ static gboolean page_on_hide_cursor (Page* self) {
 		GdkDisplay* _tmp7_ = NULL;
 		GdkCursor* _tmp8_ = NULL;
 		GdkCursor* _tmp9_ = NULL;
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1142 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1142 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = gtk_widget_get_window (_tmp1_);
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1142 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gdk_window_get_display (_tmp2_);
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1142 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1142 "/home/jens/Source/shotwell/src/Page.vala"
 		display = _tmp4_;
-#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = display;
-#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gdk_cursor_new_for_display (_tmp7_, GDK_BLANK_CURSOR);
-#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_set_cursor (_tmp6_, _tmp9_);
-#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp9_);
-#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (display);
-#line 7857 "Page.c"
+#line 7875 "Page.c"
 	}
-#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->last_timeout_id = (guint) 0;
 #line 1147 "/home/jens/Source/shotwell/src/Page.vala"
+	self->priv->last_timeout_id = (guint) 0;
+#line 1149 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1149 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7865 "Page.c"
+#line 7883 "Page.c"
 }
 
 
 void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label) {
-	GMenu* bar = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GMenu* _tmp2_ = NULL;
-	GMenu* _tmp3_ = NULL;
-	gint items = 0;
-	GMenu* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (IS_PAGE (self));
-#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (id != NULL);
-#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (new_label != NULL);
-#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = self->builder;
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
 #line 1152 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = gtk_builder_get_object (_tmp0_, "MenuBar");
+	g_return_if_fail (IS_PAGE (self));
 #line 1152 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_menu_get_type ()) ? ((GMenu*) _tmp1_) : NULL);
+	g_return_if_fail (id != NULL);
 #line 1152 "/home/jens/Source/shotwell/src/Page.vala"
-	bar = _tmp2_;
+	g_return_if_fail (new_label != NULL);
 #line 1154 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = bar;
+	_tmp0_ = app_window_get_instance ();
 #line 1154 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp3_ == NULL) {
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_object_unref0 (bar);
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
-		return;
-#line 7900 "Page.c"
-	}
-#line 1158 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp4_ = bar;
-#line 1158 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp5_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_menu_model_get_type (), GMenuModel));
-#line 1158 "/home/jens/Source/shotwell/src/Page.vala"
-	items = _tmp5_;
-#line 7908 "Page.c"
-	{
-		gint i = 0;
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
-		i = 0;
-#line 7913 "Page.c"
-		{
-			gboolean _tmp6_ = FALSE;
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
-			_tmp6_ = TRUE;
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
-			while (TRUE) {
-#line 7920 "Page.c"
-				gint _tmp8_ = 0;
-				gint _tmp9_ = 0;
-				GMenuModel* model = NULL;
-				GMenu* _tmp10_ = NULL;
-				gint _tmp11_ = 0;
-				GMenuModel* _tmp12_ = NULL;
-				GMenu* _tmp13_ = NULL;
-				gint model_items = 0;
-				GMenuModel* _tmp14_ = NULL;
-				gint _tmp15_ = 0;
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
-				if (!_tmp6_) {
-#line 7933 "Page.c"
-					gint _tmp7_ = 0;
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
-					_tmp7_ = i;
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
-					i = _tmp7_ + 1;
-#line 7939 "Page.c"
-				}
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp6_ = FALSE;
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp8_ = i;
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp9_ = items;
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
-				if (!(_tmp8_ < _tmp9_)) {
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
-					break;
-#line 7951 "Page.c"
-				}
-#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp10_ = bar;
-#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp11_ = i;
-#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp12_ = g_menu_model_get_item_link (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_menu_model_get_type (), GMenuModel), _tmp11_, G_MENU_LINK_SUBMENU);
-#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
-				model = _tmp12_;
-#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp13_ = bar;
-#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
-				if (_tmp13_ == NULL) {
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
-					_g_object_unref0 (model);
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
-					continue;
-#line 7969 "Page.c"
-				}
-#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp14_ = model;
-#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp15_ = g_menu_model_get_n_items (_tmp14_);
-#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
-				model_items = _tmp15_;
-#line 7977 "Page.c"
-				{
-					gint j = 0;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
-					j = 0;
-#line 7982 "Page.c"
-					{
-						gboolean _tmp16_ = FALSE;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp16_ = TRUE;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
-						while (TRUE) {
-#line 7989 "Page.c"
-							gint _tmp18_ = 0;
-							gint _tmp19_ = 0;
-							GMenuModel* subsection = NULL;
-							GMenuModel* _tmp20_ = NULL;
-							gint _tmp21_ = 0;
-							GMenuModel* _tmp22_ = NULL;
-							GMenuModel* _tmp23_ = NULL;
-							gint sub_items = 0;
-							GMenuModel* _tmp24_ = NULL;
-							gint _tmp25_ = 0;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
-							if (!_tmp16_) {
-#line 8002 "Page.c"
-								gint _tmp17_ = 0;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
-								_tmp17_ = j;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
-								j = _tmp17_ + 1;
-#line 8008 "Page.c"
-							}
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
-							_tmp16_ = FALSE;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
-							_tmp18_ = j;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
-							_tmp19_ = model_items;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
-							if (!(_tmp18_ < _tmp19_)) {
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
-								break;
-#line 8020 "Page.c"
-							}
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
-							_tmp20_ = model;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
-							_tmp21_ = j;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
-							_tmp22_ = g_menu_model_get_item_link (_tmp20_, _tmp21_, G_MENU_LINK_SECTION);
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
-							subsection = _tmp22_;
-#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
-							_tmp23_ = subsection;
-#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
-							if (_tmp23_ == NULL) {
-#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
-								_g_object_unref0 (subsection);
-#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
-								continue;
-#line 8038 "Page.c"
-							}
-#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
-							_tmp24_ = subsection;
-#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
-							_tmp25_ = g_menu_model_get_n_items (_tmp24_);
-#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
-							sub_items = _tmp25_;
-#line 8046 "Page.c"
-							{
-								gint k = 0;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
-								k = 0;
-#line 8051 "Page.c"
-								{
-									gboolean _tmp26_ = FALSE;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
-									_tmp26_ = TRUE;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
-									while (TRUE) {
-#line 8058 "Page.c"
-										gint _tmp28_ = 0;
-										gint _tmp29_ = 0;
-										GMenuAttributeIter* it = NULL;
-										GMenuModel* _tmp30_ = NULL;
-										gint _tmp31_ = 0;
-										GMenuAttributeIter* _tmp32_ = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
-										if (!_tmp26_) {
-#line 8067 "Page.c"
-											gint _tmp27_ = 0;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
-											_tmp27_ = k;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
-											k = _tmp27_ + 1;
-#line 8073 "Page.c"
-										}
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp26_ = FALSE;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp28_ = k;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp29_ = sub_items;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
-										if (!(_tmp28_ < _tmp29_)) {
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
-											break;
-#line 8085 "Page.c"
-										}
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp30_ = subsection;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp31_ = k;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
-										_tmp32_ = g_menu_model_iterate_item_attributes (_tmp30_, _tmp31_);
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
-										it = _tmp32_;
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
-										while (TRUE) {
-#line 8097 "Page.c"
-											GMenuAttributeIter* _tmp33_ = NULL;
-											gboolean _tmp34_ = FALSE;
-											GMenuAttributeIter* _tmp35_ = NULL;
-											const gchar* _tmp36_ = NULL;
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
-											_tmp33_ = it;
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
-											_tmp34_ = g_menu_attribute_iter_next (_tmp33_);
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
-											if (!_tmp34_) {
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
-												break;
-#line 8110 "Page.c"
-											}
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
-											_tmp35_ = it;
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
-											_tmp36_ = g_menu_attribute_iter_get_name (_tmp35_);
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
-											if (g_strcmp0 (_tmp36_, "id") == 0) {
-#line 8118 "Page.c"
-												GMenuAttributeIter* _tmp37_ = NULL;
-												GVariant* _tmp38_ = NULL;
-												GVariant* _tmp39_ = NULL;
-												const gchar* _tmp40_ = NULL;
-												const gchar* _tmp41_ = NULL;
-												gboolean _tmp42_ = FALSE;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp37_ = it;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp38_ = g_menu_attribute_iter_get_value (_tmp37_);
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp39_ = _tmp38_;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp40_ = g_variant_get_string (_tmp39_, NULL);
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp41_ = id;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
-												_tmp42_ = g_strcmp0 (_tmp40_, _tmp41_) == 0;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
-												_g_variant_unref0 (_tmp39_);
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
-												if (_tmp42_) {
-#line 8141 "Page.c"
-													GMenu* md = NULL;
-													GMenuModel* _tmp43_ = NULL;
-													GMenu* _tmp44_ = NULL;
-													GMenuItem* m = NULL;
-													GMenuModel* _tmp45_ = NULL;
-													gint _tmp46_ = 0;
-													GMenuItem* _tmp47_ = NULL;
-													GMenuItem* _tmp48_ = NULL;
-													const gchar* _tmp49_ = NULL;
-													GMenu* _tmp50_ = NULL;
-													gint _tmp51_ = 0;
-													GMenu* _tmp52_ = NULL;
-													gint _tmp53_ = 0;
-													GMenuItem* _tmp54_ = NULL;
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp43_ = subsection;
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp43_, g_menu_get_type ()) ? ((GMenu*) _tmp43_) : NULL);
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
-													md = _tmp44_;
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp45_ = subsection;
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp46_ = k;
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp47_ = g_menu_item_new_from_model (_tmp45_, _tmp46_);
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
-													m = _tmp47_;
-#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp48_ = m;
-#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp49_ = new_label;
-#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
-													g_menu_item_set_label (_tmp48_, _tmp49_);
-#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp50_ = md;
-#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp51_ = k;
-#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
-													g_menu_remove (_tmp50_, _tmp51_);
-#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp52_ = md;
-#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp53_ = k;
-#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
-													_tmp54_ = m;
-#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
-													g_menu_insert_item (_tmp52_, _tmp53_, _tmp54_);
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
-													_g_object_unref0 (m);
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
-													_g_object_unref0 (md);
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
-													_g_object_unref0 (it);
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
-													_g_object_unref0 (subsection);
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
-													_g_object_unref0 (model);
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
-													_g_object_unref0 (bar);
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
-													return;
-#line 8204 "Page.c"
-												}
-											}
-										}
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
-										_g_object_unref0 (it);
-#line 8210 "Page.c"
-									}
-								}
-							}
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
-							_g_object_unref0 (subsection);
-#line 8216 "Page.c"
-						}
-					}
-				}
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
-				_g_object_unref0 (model);
-#line 8222 "Page.c"
-			}
-		}
-	}
-#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (bar);
-#line 8228 "Page.c"
+	_tmp1_ = _tmp0_;
+#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = id;
+#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = new_label;
+#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+	app_window_update_menu_item_label (_tmp1_, _tmp2_, _tmp3_);
+#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (_tmp1_);
+#line 7910 "Page.c"
 }
 
 
@@ -8234,33 +7916,33 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 	GMenuModel* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	GMenuModel* section = NULL;
-#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (G_IS_MENU_MODEL (model), NULL);
-#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (extension_point != NULL, NULL);
-#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = model;
-#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_menu_model_get_n_items (_tmp0_);
-#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
 	items = _tmp1_;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
 	section = NULL;
-#line 8252 "Page.c"
+#line 7934 "Page.c"
 	{
 		gint i = 0;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 		i = 0;
-#line 8257 "Page.c"
+#line 7939 "Page.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = TRUE;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 			while (TRUE) {
-#line 8264 "Page.c"
+#line 7946 "Page.c"
 				gboolean _tmp4_ = FALSE;
 				gint _tmp5_ = 0;
 				gint _tmp6_ = 0;
@@ -8269,71 +7951,71 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 				gint _tmp9_ = 0;
 				const gchar* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp2_) {
-#line 8275 "Page.c"
+#line 7957 "Page.c"
 					gint _tmp3_ = 0;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp3_ = i;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 					i = _tmp3_ + 1;
-#line 8281 "Page.c"
+#line 7963 "Page.c"
 				}
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp2_ = FALSE;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp5_ = i;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp6_ = items;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp5_ < _tmp6_) {
-#line 8291 "Page.c"
+#line 7973 "Page.c"
 					GMenuModel* _tmp7_ = NULL;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp7_ = section;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp4_ = _tmp7_ == NULL;
-#line 8297 "Page.c"
+#line 7979 "Page.c"
 				} else {
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp4_ = FALSE;
-#line 8301 "Page.c"
+#line 7983 "Page.c"
 				}
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp4_) {
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 8307 "Page.c"
+#line 7989 "Page.c"
 				}
-#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Page.vala"
 				name = NULL;
-#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp8_ = model;
-#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = i;
-#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
 				g_menu_model_get_item_attribute (_tmp8_, _tmp9_, "id", "s", &name, NULL);
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = name;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = extension_point;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
 				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
-#line 8323 "Page.c"
+#line 8005 "Page.c"
 					GMenuModel* _tmp12_ = NULL;
 					gint _tmp13_ = 0;
 					GMenuModel* _tmp14_ = NULL;
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = model;
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = i;
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = g_menu_model_get_item_link (_tmp12_, _tmp13_, G_MENU_LINK_SECTION);
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (section);
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 					section = _tmp14_;
-#line 8337 "Page.c"
+#line 8019 "Page.c"
 				} else {
 					GMenuModel* subsection = NULL;
 					GMenuModel* _tmp15_ = NULL;
@@ -8343,45 +8025,45 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 					gint sub_items = 0;
 					GMenuModel* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
-#line 1206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = model;
-#line 1206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = i;
-#line 1206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = g_menu_model_get_item_link (_tmp15_, _tmp16_, G_MENU_LINK_SECTION);
-#line 1206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
 					subsection = _tmp17_;
-#line 1208 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp18_ = subsection;
-#line 1208 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
 					if (_tmp18_ == NULL) {
-#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (subsection);
-#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_free0 (name);
-#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
 						continue;
-#line 8365 "Page.c"
+#line 8047 "Page.c"
 					}
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp19_ = subsection;
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = g_menu_model_get_n_items (_tmp19_);
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
 					sub_items = _tmp20_;
-#line 8373 "Page.c"
+#line 8055 "Page.c"
 					{
 						gint j = 0;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 						j = 0;
-#line 8378 "Page.c"
+#line 8060 "Page.c"
 						{
 							gboolean _tmp21_ = FALSE;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 							_tmp21_ = TRUE;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 							while (TRUE) {
-#line 8385 "Page.c"
+#line 8067 "Page.c"
 								gboolean _tmp23_ = FALSE;
 								gint _tmp24_ = 0;
 								gint _tmp25_ = 0;
@@ -8390,286 +8072,286 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 								gint _tmp28_ = 0;
 								GMenuModel* _tmp29_ = NULL;
 								GMenuModel* _tmp30_ = NULL;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp21_) {
-#line 8396 "Page.c"
+#line 8078 "Page.c"
 									gint _tmp22_ = 0;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp22_ = j;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 									j = _tmp22_ + 1;
-#line 8402 "Page.c"
+#line 8084 "Page.c"
 								}
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp21_ = FALSE;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp24_ = j;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp25_ = sub_items;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 								if (_tmp24_ < _tmp25_) {
-#line 8412 "Page.c"
+#line 8094 "Page.c"
 									GMenuModel* _tmp26_ = NULL;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp26_ = section;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp23_ = _tmp26_ == NULL;
-#line 8418 "Page.c"
+#line 8100 "Page.c"
 								} else {
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp23_ = FALSE;
-#line 8422 "Page.c"
+#line 8104 "Page.c"
 								}
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp23_) {
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 									break;
-#line 8428 "Page.c"
+#line 8110 "Page.c"
 								}
-#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp27_ = subsection;
-#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp28_ = j;
-#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp29_ = g_menu_model_get_item_link (_tmp27_, _tmp28_, G_MENU_LINK_SUBMENU);
-#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
 								submenu = _tmp29_;
-#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp30_ = submenu;
-#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 								if (_tmp30_ != NULL) {
-#line 8442 "Page.c"
+#line 8124 "Page.c"
 									GMenuModel* _tmp31_ = NULL;
 									const gchar* _tmp32_ = NULL;
 									GMenuModel* _tmp33_ = NULL;
-#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp31_ = submenu;
-#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp32_ = extension_point;
-#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp33_ = page_find_extension_point (self, _tmp31_, _tmp32_);
-#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
 									_g_object_unref0 (section);
-#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
 									section = _tmp33_;
-#line 8456 "Page.c"
+#line 8138 "Page.c"
 								}
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 								_g_object_unref0 (submenu);
-#line 8460 "Page.c"
+#line 8142 "Page.c"
 							}
 						}
 					}
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (subsection);
-#line 8466 "Page.c"
+#line 8148 "Page.c"
 				}
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (name);
-#line 8470 "Page.c"
+#line 8152 "Page.c"
 			}
 		}
 	}
-#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 	result = section;
-#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8478 "Page.c"
+#line 8160 "Page.c"
 }
 
 
 static void page_class_init (PageClass * klass) {
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	page_parent_class = g_type_class_peek_parent (klass);
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (PagePrivate));
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->destroy = page_real_destroy;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_page_name = page_real_set_page_name;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_container = page_real_set_container;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->clear_container = page_real_clear_container;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->get_toolbar = page_real_get_toolbar;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->get_page_context_menu = page_real_get_page_context_menu;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switching_from = page_real_switching_from;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = page_real_switched_to;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->ready = page_real_ready;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switching_to_fullscreen = page_real_switching_to_fullscreen;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->returning_from_fullscreen = page_real_returning_from_fullscreen;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->add_actions = page_real_add_actions;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = page_real_init_collect_ui_filenames;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->init_collect_injection_groups = page_real_init_collect_injection_groups;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->init_actions = page_real_init_actions;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->update_actions = page_real_update_actions;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->source_drag_failed = page_real_source_drag_failed;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_click = page_real_on_left_click;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_middle_click = page_real_on_middle_click;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_right_click = page_real_on_right_click;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_released = page_real_on_left_released;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_middle_released = page_real_on_middle_released;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_right_released = page_real_on_right_released;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_ctrl_pressed = page_real_on_ctrl_pressed;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_ctrl_released = page_real_on_ctrl_released;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_alt_pressed = page_real_on_alt_pressed;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_alt_released = page_real_on_alt_released;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_shift_pressed = page_real_on_shift_pressed;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_shift_released = page_real_on_shift_released;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_super_pressed = page_real_on_super_pressed;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_super_released = page_real_on_super_released;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_app_key_pressed = page_real_on_app_key_pressed;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_app_key_released = page_real_on_app_key_released;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_move = page_real_on_move;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_move_start = page_real_on_move_start;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_move_finished = page_real_on_move_finished;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_resize = page_real_on_resize;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_resize_start = page_real_on_resize_start;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_resize_finished = page_real_on_resize_finished;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_configure = page_real_on_configure;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_motion = page_real_on_motion;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_leave_notify_event = page_real_on_leave_notify_event;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_mousewheel_up = page_real_on_mousewheel_up;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_mousewheel_down = page_real_on_mousewheel_down;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_mousewheel_left = page_real_on_mousewheel_left;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_mousewheel_right = page_real_on_mousewheel_right;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = page_real_on_context_keypress;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_buttonpress = page_real_on_context_buttonpress;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_invoked = page_real_on_context_invoked;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_page_cursor = page_real_set_page_cursor;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_finalize;
-#line 8589 "Page.c"
+#line 8271 "Page.c"
 }
 
 
 static void page_instance_init (Page * self) {
 	GtkBuilder* _tmp0_ = NULL;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = PAGE_GET_PRIVATE (self);
-#line 62 "/home/jens/Source/shotwell/src/Page.vala"
+#line 61 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gtk_builder_new ();
-#line 62 "/home/jens/Source/shotwell/src/Page.vala"
+#line 61 "/home/jens/Source/shotwell/src/Page.vala"
 	self->builder = _tmp0_;
-#line 64 "/home/jens/Source/shotwell/src/Page.vala"
+#line 63 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = FALSE;
-#line 67 "/home/jens/Source/shotwell/src/Page.vala"
+#line 66 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->view = NULL;
-#line 68 "/home/jens/Source/shotwell/src/Page.vala"
+#line 67 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->container = NULL;
-#line 70 "/home/jens/Source/shotwell/src/Page.vala"
+#line 69 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&self->priv->last_position, 0, sizeof (GdkRectangle));
-#line 71 "/home/jens/Source/shotwell/src/Page.vala"
+#line 70 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = NULL;
-#line 72 "/home/jens/Source/shotwell/src/Page.vala"
+#line 71 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = FALSE;
-#line 73 "/home/jens/Source/shotwell/src/Page.vala"
+#line 72 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_configure_ms = (gulong) 0;
-#line 74 "/home/jens/Source/shotwell/src/Page.vala"
+#line 73 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_move_finished = FALSE;
-#line 75 "/home/jens/Source/shotwell/src/Page.vala"
+#line 74 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_resize_finished = FALSE;
-#line 76 "/home/jens/Source/shotwell/src/Page.vala"
+#line 75 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&self->priv->last_down, 0, sizeof (GdkPoint));
-#line 77 "/home/jens/Source/shotwell/src/Page.vala"
+#line 76 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->is_destroyed = FALSE;
-#line 78 "/home/jens/Source/shotwell/src/Page.vala"
+#line 77 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->ctrl_pressed = FALSE;
-#line 79 "/home/jens/Source/shotwell/src/Page.vala"
+#line 78 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->alt_pressed = FALSE;
-#line 80 "/home/jens/Source/shotwell/src/Page.vala"
+#line 79 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->shift_pressed = FALSE;
-#line 81 "/home/jens/Source/shotwell/src/Page.vala"
+#line 80 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->super_pressed = FALSE;
-#line 82 "/home/jens/Source/shotwell/src/Page.vala"
+#line 81 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_cursor = GDK_LEFT_PTR;
-#line 83 "/home/jens/Source/shotwell/src/Page.vala"
+#line 82 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hidden = FALSE;
-#line 84 "/home/jens/Source/shotwell/src/Page.vala"
+#line 83 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = 0;
-#line 85 "/home/jens/Source/shotwell/src/Page.vala"
+#line 84 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_timeout_id = (guint) 0;
-#line 86 "/home/jens/Source/shotwell/src/Page.vala"
+#line 85 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_time_cached = 0;
-#line 87 "/home/jens/Source/shotwell/src/Page.vala"
+#line 86 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = FALSE;
-#line 88 "/home/jens/Source/shotwell/src/Page.vala"
+#line 87 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->update_actions_scheduler = NULL;
-#line 208 "/home/jens/Source/shotwell/src/Page.vala"
+#line 207 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->menubar_injected = FALSE;
-#line 8647 "Page.c"
+#line 8329 "Page.c"
 }
 
 
 static void page_finalize (GObject* obj) {
 	Page * self;
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE, Page);
-#line 62 "/home/jens/Source/shotwell/src/Page.vala"
+#line 61 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->builder);
-#line 63 "/home/jens/Source/shotwell/src/Page.vala"
+#line 62 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->toolbar);
-#line 66 "/home/jens/Source/shotwell/src/Page.vala"
+#line 65 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_name);
-#line 67 "/home/jens/Source/shotwell/src/Page.vala"
+#line 66 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (self->priv->view);
-#line 68 "/home/jens/Source/shotwell/src/Page.vala"
+#line 67 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->container);
-#line 69 "/home/jens/Source/shotwell/src/Page.vala"
+#line 68 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->toolbar_path);
-#line 71 "/home/jens/Source/shotwell/src/Page.vala"
+#line 70 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 88 "/home/jens/Source/shotwell/src/Page.vala"
+#line 87 "/home/jens/Source/shotwell/src/Page.vala"
 	_one_shot_scheduler_unref0 (self->priv->update_actions_scheduler);
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (page_parent_class)->finalize (obj);
-#line 8673 "Page.c"
+#line 8355 "Page.c"
 }
 
 
@@ -8698,30 +8380,30 @@ GType checkerboard_page_activator_get_type (void) {
 
 
 static void _checkerboard_page_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, GeeCollection* hidden, gpointer self) {
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_hidden ((CheckerboardPage*) self, hidden);
-#line 8704 "Page.c"
+#line 8386 "Page.c"
 }
 
 
 static void _checkerboard_page_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_contents_altered ((CheckerboardPage*) self, added, removed);
-#line 8711 "Page.c"
+#line 8393 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_state_changed ((CheckerboardPage*) self, changed);
-#line 8718 "Page.c"
+#line 8400 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_visibility_changed ((CheckerboardPage*) self, changed);
-#line 8725 "Page.c"
+#line 8407 "Page.c"
 }
 
 
@@ -8750,141 +8432,141 @@ CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* p
 	ViewCollection* _tmp20_ = NULL;
 	ViewCollection* _tmp21_ = NULL;
 	ViewCollection* _tmp22_ = NULL;
-#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (CheckerboardPage*) page_construct (object_type, _tmp0_);
-#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_new (_tmp2_);
-#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->layout = _tmp3_;
-#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->layout;
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_name;
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp4_, _tmp5_);
-#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->layout;
-#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_event_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 1271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 1272 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_scrolled_window_set_shadow_type (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_SHADOW_NONE);
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->viewport;
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->viewport;
-#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp8_, GTK_SHADOW_NONE);
-#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->viewport;
-#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->layout;
-#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = gtk_scrolled_window_get_hadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_adjustments (_tmp11_, _tmp12_, _tmp13_);
-#line 1283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1245 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->viewport;
-#line 1283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1245 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp16_, "items-hidden", (GCallback) _checkerboard_page_on_items_hidden_view_collection_items_hidden, self, 0);
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _checkerboard_page_on_contents_altered_data_collection_contents_altered, self, 0);
-#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp18_);
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_;
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp20_, "items-state-changed", (GCallback) _checkerboard_page_on_items_state_changed_view_collection_items_state_changed, self, 0);
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = _tmp21_;
-#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp22_, "items-visibility-changed", (GCallback) _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed, self, 0);
-#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_scrolled_window_set_policy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 8850 "Page.c"
+#line 8532 "Page.c"
 }
 
 
 void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = _tmp1_;
-#line 8869 "Page.c"
+#line 8551 "Page.c"
 }
 
 
 void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = _tmp1_;
-#line 8888 "Page.c"
+#line 8570 "Page.c"
 }
 
 
@@ -8895,44 +8577,44 @@ GtkMenu* checkerboard_page_get_context_menu (CheckerboardPage* self) {
 	ViewCollection* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1265 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != 0;
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 8913 "Page.c"
+#line 8595 "Page.c"
 		GtkMenu* _tmp5_ = NULL;
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = checkerboard_page_get_item_context_menu (self);
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp5_;
-#line 8921 "Page.c"
+#line 8603 "Page.c"
 	} else {
 		GtkMenu* _tmp6_ = NULL;
-#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp6_;
-#line 8930 "Page.c"
+#line 8612 "Page.c"
 	}
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8936 "Page.c"
+#line 8618 "Page.c"
 }
 
 
@@ -8941,11 +8623,11 @@ static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage*
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp8_ = NULL;
 	GtkMenu* _tmp9_ = NULL;
-#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->item_context_menu;
-#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 8949 "Page.c"
+#line 8631 "Page.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -8954,52 +8636,52 @@ static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage*
 		GMenuModel* _tmp5_ = NULL;
 		GtkMenu* _tmp6_ = NULL;
 		GtkMenu* _tmp7_ = NULL;
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->item_context_menu_path;
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_builder_get_object (_tmp1_, _tmp2_);
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp3_) : NULL);
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 		model = _tmp4_;
-#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = model;
-#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
 		g_object_ref_sink (_tmp6_);
-#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->item_context_menu);
-#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->item_context_menu = _tmp6_;
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->item_context_menu;
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_attach_to_widget (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (model);
-#line 8984 "Page.c"
+#line 8666 "Page.c"
 	}
-#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->item_context_menu;
-#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp9_;
-#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8994 "Page.c"
+#line 8676 "Page.c"
 }
 
 
 GtkMenu* checkerboard_page_get_item_context_menu (CheckerboardPage* self) {
-#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_item_context_menu (self);
-#line 9003 "Page.c"
+#line 8685 "Page.c"
 }
 
 
@@ -9009,13 +8691,13 @@ static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) {
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp8_ = NULL;
 	GtkMenu* _tmp9_ = NULL;
-#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page_context_menu;
-#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 9019 "Page.c"
+#line 8701 "Page.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -9024,43 +8706,43 @@ static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) {
 		GMenuModel* _tmp5_ = NULL;
 		GtkMenu* _tmp6_ = NULL;
 		GtkMenu* _tmp7_ = NULL;
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->page_context_menu_path;
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_builder_get_object (_tmp1_, _tmp2_);
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp3_) : NULL);
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		model = _tmp4_;
-#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = model;
-#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 		g_object_ref_sink (_tmp6_);
-#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->page_context_menu);
-#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->page_context_menu = _tmp6_;
-#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->page_context_menu;
-#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_attach_to_widget (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (model);
-#line 9054 "Page.c"
+#line 8736 "Page.c"
 	}
-#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->page_context_menu;
-#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp9_;
-#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9064 "Page.c"
+#line 8746 "Page.c"
 }
 
 
@@ -9071,23 +8753,23 @@ static gboolean checkerboard_page_real_on_context_keypress (Page* base) {
 	GtkMenu* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = checkerboard_page_get_context_menu (self);
-#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9091 "Page.c"
+#line 8773 "Page.c"
 }
 
 
@@ -9095,24 +8777,24 @@ static gchar* checkerboard_page_real_get_view_empty_message (CheckerboardPage* s
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = _ ("No photos/videos");
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9107 "Page.c"
+#line 8789 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_view_empty_message (CheckerboardPage* self) {
-#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_empty_message (self);
-#line 9116 "Page.c"
+#line 8798 "Page.c"
 }
 
 
@@ -9120,42 +8802,42 @@ static gchar* checkerboard_page_real_get_filter_no_match_message (CheckerboardPa
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = _ ("No photos/videos found which match the current filter");
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9132 "Page.c"
+#line 8814 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_filter_no_match_message (CheckerboardPage* self) {
-#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_filter_no_match_message (self);
-#line 9141 "Page.c"
+#line 8823 "Page.c"
 }
 
 
 static void checkerboard_page_real_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 9150 "Page.c"
+#line 8832 "Page.c"
 }
 
 
 void checkerboard_page_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->on_item_activated (self, item, activator, modifiers);
-#line 9159 "Page.c"
+#line 8841 "Page.c"
 }
 
 
@@ -9163,61 +8845,61 @@ CheckerboardLayout* checkerboard_page_get_checkerboard_layout (CheckerboardPage*
 	CheckerboardLayout* result = NULL;
 	CheckerboardLayout* _tmp0_ = NULL;
 	CheckerboardLayout* _tmp1_ = NULL;
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9177 "Page.c"
+#line 8859 "Page.c"
 }
 
 
 static SearchViewFilter* checkerboard_page_real_get_search_view_filter (CheckerboardPage* self) {
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 	g_critical ("Type `%s' does not implement abstract method `checkerboard_page_get_search_view_filter'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 9186 "Page.c"
+#line 8868 "Page.c"
 }
 
 
 SearchViewFilter* checkerboard_page_get_search_view_filter (CheckerboardPage* self) {
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_search_view_filter (self);
-#line 9195 "Page.c"
+#line 8877 "Page.c"
 }
 
 
 static CoreViewTracker* checkerboard_page_real_get_view_tracker (CheckerboardPage* self) {
 	CoreViewTracker* result = NULL;
-#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9205 "Page.c"
+#line 8887 "Page.c"
 }
 
 
 CoreViewTracker* checkerboard_page_get_view_tracker (CheckerboardPage* self) {
-#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_tracker (self);
-#line 9214 "Page.c"
+#line 8896 "Page.c"
 }
 
 
 static void _checkerboard_page_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self) {
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh ((CheckerboardPage*) self);
-#line 9221 "Page.c"
+#line 8903 "Page.c"
 }
 
 
@@ -9229,33 +8911,33 @@ static void checkerboard_page_real_switching_from (Page* base) {
 	guint _tmp3_ = 0U;
 	ViewCollection* _tmp4_ = NULL;
 	ViewCollection* _tmp5_ = NULL;
-#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, FALSE);
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp3_, NULL, FALSE);
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIEW_FILTER, ViewFilter), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _checkerboard_page_on_view_filter_refresh_view_filter_refresh, self);
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_all (_tmp5_);
-#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (checkerboard_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 9259 "Page.c"
+#line 8941 "Page.c"
 }
 
 
@@ -9268,35 +8950,35 @@ static void checkerboard_page_real_switched_to (Page* base) {
 	ViewCollection* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
 	gboolean _tmp6_ = FALSE;
-#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1332 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, TRUE);
-#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIEW_FILTER, ViewFilter), "refresh", (GCallback) _checkerboard_page_on_view_filter_refresh_view_filter_refresh, self, 0);
-#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh (self);
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_ > 0;
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp4_);
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
-#line 9300 "Page.c"
+#line 8982 "Page.c"
 		CheckerboardItem* item = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
@@ -9311,37 +8993,37 @@ static void checkerboard_page_real_switched_to (Page* base) {
 		GdkRectangle _tmp16_ = {0};
 		gint _tmp17_ = 0;
 		AdjustmentRelation _tmp18_ = 0;
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_at (_tmp8_, 0);
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp10_;
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
 		vadj = _tmp12_;
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = vadj;
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = item;
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->allocation;
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = _tmp16_.y;
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp14_, _tmp17_);
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp18_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 9345 "Page.c"
+#line 9027 "Page.c"
 			GtkAdjustment* _tmp19_ = NULL;
 			CheckerboardItem* _tmp20_ = NULL;
 			GdkRectangle _tmp21_ = {0};
@@ -9350,33 +9032,33 @@ static void checkerboard_page_real_switched_to (Page* base) {
 			GdkRectangle _tmp24_ = {0};
 			gint _tmp25_ = 0;
 			AdjustmentRelation _tmp26_ = 0;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = vadj;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = item;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_->allocation;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = _tmp21_.y;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = item;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = _tmp23_->allocation;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = _tmp24_.height;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = get_adjustment_relation (_tmp19_, _tmp22_ + _tmp25_);
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp26_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 9372 "Page.c"
+#line 9054 "Page.c"
 		} else {
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = FALSE;
-#line 9376 "Page.c"
+#line 9058 "Page.c"
 		}
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp13_) {
-#line 9380 "Page.c"
+#line 9062 "Page.c"
 			gint top = 0;
 			CheckerboardItem* _tmp27_ = NULL;
 			GdkRectangle _tmp28_ = {0};
@@ -9385,38 +9067,38 @@ static void checkerboard_page_real_switched_to (Page* base) {
 			gdouble _tmp31_ = 0.0;
 			GtkAdjustment* _tmp45_ = NULL;
 			gint _tmp46_ = 0;
-#line 1384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
 			top = 0;
-#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = item;
-#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_->allocation;
-#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _tmp28_.y;
-#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = vadj;
-#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = gtk_adjustment_get_value (_tmp30_);
-#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
 			if (((gdouble) _tmp29_) < _tmp31_) {
-#line 9403 "Page.c"
+#line 9085 "Page.c"
 				CheckerboardItem* _tmp32_ = NULL;
 				GdkRectangle _tmp33_ = {0};
 				gint _tmp34_ = 0;
 				gint _tmp35_ = 0;
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1348 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = item;
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1348 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp33_ = _tmp32_->allocation;
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1348 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = _tmp33_.y;
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1348 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp34_;
-#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = top;
-#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp35_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9420 "Page.c"
+#line 9102 "Page.c"
 			} else {
 				CheckerboardItem* _tmp36_ = NULL;
 				GdkRectangle _tmp37_ = {0};
@@ -9427,91 +9109,91 @@ static void checkerboard_page_real_switched_to (Page* base) {
 				GtkAdjustment* _tmp42_ = NULL;
 				gdouble _tmp43_ = 0.0;
 				gint _tmp44_ = 0;
-#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = item;
-#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = _tmp36_->allocation;
-#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_.y;
-#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = item;
-#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = _tmp39_->allocation;
-#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_.height;
-#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = vadj;
-#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = gtk_adjustment_get_page_size (_tmp42_);
-#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 				top = (_tmp38_ + _tmp41_) - ((gint) _tmp43_);
-#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1352 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = top;
-#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1352 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp44_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9453 "Page.c"
+#line 9135 "Page.c"
 			}
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = vadj;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = top;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_adjustment_set_value (_tmp45_, (gdouble) _tmp46_);
-#line 9461 "Page.c"
+#line 9143 "Page.c"
 		}
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 9467 "Page.c"
+#line 9149 "Page.c"
 	}
-#line 1398 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (checkerboard_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 9471 "Page.c"
+#line 9153 "Page.c"
 }
 
 
 static void checkerboard_page_on_view_filter_refresh (CheckerboardPage* self) {
-#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9480 "Page.c"
+#line 9162 "Page.c"
 }
 
 
 static void checkerboard_page_on_contents_altered (CheckerboardPage* self, GeeIterable* added, GeeIterable* removed) {
-#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9493 "Page.c"
+#line 9175 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_state_changed (CheckerboardPage* self, GeeIterable* changed) {
-#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (changed));
-#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9504 "Page.c"
+#line 9186 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_visibility_changed (CheckerboardPage* self, GeeCollection* changed) {
-#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (changed));
-#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9515 "Page.c"
+#line 9197 "Page.c"
 }
 
 
@@ -9521,87 +9203,87 @@ static void checkerboard_page_update_view_filter_message (CheckerboardPage* self
 	ViewCollection* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 1418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_are_items_filtered_out (_tmp2_);
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 9539 "Page.c"
+#line 9221 "Page.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_ == 0;
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 9553 "Page.c"
+#line 9235 "Page.c"
 	} else {
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 9557 "Page.c"
+#line 9239 "Page.c"
 	}
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 9561 "Page.c"
+#line 9243 "Page.c"
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_page_get_filter_no_match_message (self);
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_set_page_message (self, _tmp9_);
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp9_);
-#line 9572 "Page.c"
+#line 9254 "Page.c"
 	} else {
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
 		gboolean _tmp13_ = FALSE;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_ == 0;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp13_) {
-#line 9590 "Page.c"
+#line 9272 "Page.c"
 			gchar* _tmp14_ = NULL;
 			gchar* _tmp15_ = NULL;
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = checkerboard_page_get_view_empty_message (self);
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _tmp14_;
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_set_page_message (self, _tmp15_);
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp15_);
-#line 9601 "Page.c"
+#line 9283 "Page.c"
 		} else {
-#line 1424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_unset_page_message (self);
-#line 9605 "Page.c"
+#line 9287 "Page.c"
 		}
 	}
 }
@@ -9611,27 +9293,27 @@ void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* me
 	CheckerboardLayout* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (message != NULL);
-#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = message;
-#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_message (_tmp0_, _tmp1_);
-#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1392 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1392 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_) {
-#line 9629 "Page.c"
+#line 9311 "Page.c"
 		CheckerboardLayout* _tmp3_ = NULL;
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->layout;
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 9635 "Page.c"
+#line 9317 "Page.c"
 	}
 }
 
@@ -9639,23 +9321,23 @@ void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* me
 void checkerboard_page_unset_page_message (CheckerboardPage* self) {
 	CheckerboardLayout* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_unset_message (_tmp0_);
-#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1398 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1398 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 9653 "Page.c"
+#line 9335 "Page.c"
 		CheckerboardLayout* _tmp2_ = NULL;
-#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 9659 "Page.c"
+#line 9341 "Page.c"
 	}
 }
 
@@ -9665,21 +9347,21 @@ static void checkerboard_page_real_set_page_name (Page* base, const gchar* name)
 	const gchar* _tmp0_ = NULL;
 	CheckerboardLayout* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (checkerboard_page_parent_class)->set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_);
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->layout;
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = name;
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp1_, _tmp2_);
-#line 9683 "Page.c"
+#line 9365 "Page.c"
 }
 
 
@@ -9689,43 +9371,43 @@ CheckerboardItem* checkerboard_page_get_item_at_pixel (CheckerboardPage* self, g
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	CheckerboardItem* _tmp3_ = NULL;
-#line 1446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_get_item_at_pixel (_tmp0_, _tmp1_, _tmp2_);
-#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9707 "Page.c"
+#line 9389 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterable* hidden) {
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (hidden));
-#line 9716 "Page.c"
+#line 9398 "Page.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = hidden;
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 		_view_it = _tmp1_;
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 9729 "Page.c"
+#line 9411 "Page.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			DataView* view = NULL;
@@ -9740,73 +9422,73 @@ static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterab
 			CheckerboardItem* _tmp11_ = NULL;
 			CheckerboardItem* _tmp12_ = NULL;
 			CheckerboardItem* _tmp13_ = NULL;
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = _view_it;
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp3_) {
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9752 "Page.c"
+#line 9434 "Page.c"
 			}
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = _view_it;
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 			view = (DataView*) _tmp5_;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = view;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp7_;
-#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = self->anchor;
-#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = item;
-#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp8_ == _tmp9_) {
-#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = NULL;
-#line 9776 "Page.c"
+#line 9458 "Page.c"
 			}
-#line 1457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = self->cursor;
-#line 1457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = item;
-#line 1457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp10_ == _tmp11_) {
-#line 1458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = NULL;
-#line 9788 "Page.c"
+#line 9470 "Page.c"
 			}
-#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = self->priv->highlighted;
-#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = item;
-#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp12_ == _tmp13_) {
-#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->highlighted);
-#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->highlighted = NULL;
-#line 9800 "Page.c"
+#line 9482 "Page.c"
 			}
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (view);
-#line 9806 "Page.c"
+#line 9488 "Page.c"
 		}
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_view_it);
-#line 9810 "Page.c"
+#line 9492 "Page.c"
 	}
 }
 
@@ -9823,138 +9505,138 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 	const gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	GQuark _tmp7_ = 0U;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label0 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label1 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label2 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label3 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label4 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label5 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label6 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label7 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label8 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label9 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label10 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label12 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label13 = 0;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label14 = 0;
-#line 9857 "Page.c"
+#line 9539 "Page.c"
 	gboolean _tmp45_ = FALSE;
 	gboolean _tmp46_ = FALSE;
-#line 1465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 1469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->state;
-#line 1469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp1_ & GDK_SHIFT_MASK);
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_);
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("Up")))) || (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("KP_Up"))))) {
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9886 "Page.c"
+#line 9568 "Page.c"
 			default:
 			{
 				guint _tmp8_ = 0U;
-#line 1474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_NORTH);
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp8_ = state;
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp8_);
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9898 "Page.c"
+#line 9580 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label2) ? _tmp6_label2 : (_tmp6_label2 = g_quark_from_static_string ("Down")))) || (_tmp7_ == ((0 != _tmp6_label3) ? _tmp6_label3 : (_tmp6_label3 = g_quark_from_static_string ("KP_Down"))))) {
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9904 "Page.c"
+#line 9586 "Page.c"
 			default:
 			{
 				guint _tmp9_ = 0U;
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_SOUTH);
-#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = state;
-#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp9_);
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9916 "Page.c"
+#line 9598 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label4) ? _tmp6_label4 : (_tmp6_label4 = g_quark_from_static_string ("Left")))) || (_tmp7_ == ((0 != _tmp6_label5) ? _tmp6_label5 : (_tmp6_label5 = g_quark_from_static_string ("KP_Left"))))) {
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9922 "Page.c"
+#line 9604 "Page.c"
 			default:
 			{
 				guint _tmp10_ = 0U;
-#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_WEST);
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = state;
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp10_);
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9934 "Page.c"
+#line 9616 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label6) ? _tmp6_label6 : (_tmp6_label6 = g_quark_from_static_string ("Right")))) || (_tmp7_ == ((0 != _tmp6_label7) ? _tmp6_label7 : (_tmp6_label7 = g_quark_from_static_string ("KP_Right"))))) {
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9940 "Page.c"
+#line 9622 "Page.c"
 			default:
 			{
 				guint _tmp11_ = 0U;
-#line 1492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_EAST);
-#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = state;
-#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp11_);
-#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9952 "Page.c"
+#line 9634 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label8) ? _tmp6_label8 : (_tmp6_label8 = g_quark_from_static_string ("Home")))) || (_tmp7_ == ((0 != _tmp6_label9) ? _tmp6_label9 : (_tmp6_label9 = g_quark_from_static_string ("KP_Home"))))) {
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9958 "Page.c"
+#line 9640 "Page.c"
 			default:
 			{
 				CheckerboardItem* first = NULL;
@@ -9964,45 +9646,45 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				CheckerboardItem* _tmp15_ = NULL;
 				CheckerboardItem* _tmp16_ = NULL;
 				guint _tmp18_ = 0U;
-#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = _tmp12_;
-#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = view_collection_get_first (_tmp13_);
-#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp13_);
-#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 				first = _tmp15_;
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = first;
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp16_ != NULL) {
-#line 9984 "Page.c"
+#line 9666 "Page.c"
 					CheckerboardItem* _tmp17_ = NULL;
-#line 1500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = first;
-#line 1500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp17_);
-#line 9990 "Page.c"
+#line 9672 "Page.c"
 				}
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1463 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = state;
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1463 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp18_);
-#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (first);
-#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10000 "Page.c"
+#line 9682 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label10) ? _tmp6_label10 : (_tmp6_label10 = g_quark_from_static_string ("End")))) || (_tmp7_ == ((0 != _tmp6_label11) ? _tmp6_label11 : (_tmp6_label11 = g_quark_from_static_string ("KP_End"))))) {
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 10006 "Page.c"
+#line 9688 "Page.c"
 			default:
 			{
 				CheckerboardItem* last = NULL;
@@ -10012,100 +9694,100 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				CheckerboardItem* _tmp22_ = NULL;
 				CheckerboardItem* _tmp23_ = NULL;
 				guint _tmp25_ = 0U;
-#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp19_;
-#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = view_collection_get_last (_tmp20_);
-#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp20_);
-#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
 				last = _tmp22_;
-#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = last;
-#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp23_ != NULL) {
-#line 10032 "Page.c"
+#line 9714 "Page.c"
 					CheckerboardItem* _tmp24_ = NULL;
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = last;
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp24_);
-#line 10038 "Page.c"
+#line 9720 "Page.c"
 				}
-#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = state;
-#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp25_);
-#line 1510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (last);
-#line 1510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10048 "Page.c"
+#line 9730 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label12) ? _tmp6_label12 : (_tmp6_label12 = g_quark_from_static_string ("Return")))) || (_tmp7_ == ((0 != _tmp6_label13) ? _tmp6_label13 : (_tmp6_label13 = g_quark_from_static_string ("KP_Enter"))))) {
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 10054 "Page.c"
+#line 9736 "Page.c"
 			default:
 			{
 				ViewCollection* _tmp26_ = NULL;
 				ViewCollection* _tmp27_ = NULL;
 				gint _tmp28_ = 0;
 				gboolean _tmp29_ = FALSE;
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = view_collection_get_selected_count (_tmp27_);
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_ == 1;
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp27_);
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp29_) {
-#line 10073 "Page.c"
+#line 9755 "Page.c"
 					ViewCollection* _tmp30_ = NULL;
 					ViewCollection* _tmp31_ = NULL;
 					DataView* _tmp32_ = NULL;
 					CheckerboardItem* _tmp33_ = NULL;
 					CheckerboardPageKeyboardModifiers _tmp34_ = {0};
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = _tmp30_;
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = view_collection_get_selected_at (_tmp31_, 0);
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_keyboard_modifiers_init (&_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_on_item_activated (self, _tmp33_, CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD, &_tmp34_);
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp33_);
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp31_);
-#line 10095 "Page.c"
+#line 9777 "Page.c"
 				} else {
-#line 1518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
 					handled = FALSE;
-#line 10099 "Page.c"
+#line 9781 "Page.c"
 				}
-#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10103 "Page.c"
+#line 9785 "Page.c"
 			}
 		}
 	} else if (_tmp7_ == ((0 != _tmp6_label14) ? _tmp6_label14 : (_tmp6_label14 = g_quark_from_static_string ("space")))) {
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 10109 "Page.c"
+#line 9791 "Page.c"
 			default:
 			{
 				Marker* marker = NULL;
@@ -10119,89 +9801,89 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				ViewCollection* _tmp42_ = NULL;
 				ViewCollection* _tmp43_ = NULL;
 				Marker* _tmp44_ = NULL;
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = _tmp35_;
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = self->priv->layout;
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = checkerboard_layout_get_cursor (_tmp37_);
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = _tmp38_;
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_OBJECT, DataObject));
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_;
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp39_);
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp36_);
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp41_;
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _tmp42_;
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = marker;
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp43_, _tmp44_);
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp43_);
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10157 "Page.c"
+#line 9839 "Page.c"
 			}
 		}
 	} else {
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 10163 "Page.c"
+#line 9845 "Page.c"
 			default:
 			{
-#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10170 "Page.c"
+#line 9852 "Page.c"
 			}
 		}
 	}
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = handled;
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp45_) {
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10182 "Page.c"
+#line 9864 "Page.c"
 	}
-#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (checkerboard_page_parent_class)->key_press_event != NULL) {
-#line 10186 "Page.c"
+#line 9868 "Page.c"
 		GdkEventKey* _tmp47_ = NULL;
 		gboolean _tmp48_ = FALSE;
-#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = event;
-#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = GTK_WIDGET_CLASS (checkerboard_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), gtk_widget_get_type (), GtkWidget), _tmp47_);
-#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp48_;
-#line 10195 "Page.c"
+#line 9877 "Page.c"
 	} else {
-#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = TRUE;
-#line 10199 "Page.c"
+#line 9881 "Page.c"
 	}
-#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp46_;
-#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10205 "Page.c"
+#line 9887 "Page.c"
 }
 
 
@@ -10225,62 +9907,62 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 	ViewCollection* _tmp107_ = NULL;
 	gint _tmp108_ = 0;
 	gboolean _tmp109_ = FALSE;
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = event;
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_->type;
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != GDK_BUTTON_PRESS) {
-#line 10239 "Page.c"
+#line 9921 "Page.c"
 		GdkEventButton* _tmp3_ = NULL;
 		GdkEventType _tmp4_ = 0;
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = event;
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_->type;
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp4_ != GDK_2BUTTON_PRESS;
-#line 10248 "Page.c"
+#line 9930 "Page.c"
 	} else {
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 10252 "Page.c"
+#line 9934 "Page.c"
 	}
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10260 "Page.c"
+#line 9942 "Page.c"
 	}
-#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK));
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = event;
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_->x;
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = event;
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_->y;
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = checkerboard_page_get_item_at_pixel (self, _tmp8_, _tmp10_);
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp11_;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ != NULL) {
-#line 10284 "Page.c"
+#line 9966 "Page.c"
 		CheckerboardLayout* _tmp13_ = NULL;
 		CheckerboardItem* _tmp14_ = NULL;
 		GdkEventButton* _tmp15_ = NULL;
@@ -10293,41 +9975,41 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 		guint _tmp22_ = 0U;
 		CheckerboardLayout* _tmp80_ = NULL;
 		CheckerboardItem* _tmp81_ = NULL;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = self->priv->layout;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = item;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = event;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->x;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp17_->y;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = event;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_->state;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = checkerboard_layout_handle_left_click (_tmp13_, _tmp14_, _tmp16_, _tmp18_, _tmp20_);
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 			result = TRUE;
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 10323 "Page.c"
+#line 10005 "Page.c"
 		}
-#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = state;
-#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp22_) {
-#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 10331 "Page.c"
+#line 10013 "Page.c"
 			{
 				Marker* marker = NULL;
 				ViewCollection* _tmp23_ = NULL;
@@ -10340,68 +10022,68 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				Marker* _tmp30_ = NULL;
 				CheckerboardItem* _tmp31_ = NULL;
 				gboolean _tmp32_ = FALSE;
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = _tmp23_;
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = item;
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject));
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp24_);
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp27_;
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_;
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = marker;
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp29_, _tmp30_);
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp29_);
-#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = item;
-#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_VIEW, DataView));
-#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp32_) {
-#line 10374 "Page.c"
+#line 10056 "Page.c"
 					CheckerboardItem* _tmp33_ = NULL;
 					CheckerboardItem* _tmp34_ = NULL;
 					CheckerboardItem* _tmp35_ = NULL;
 					CheckerboardItem* _tmp36_ = NULL;
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = item;
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp34_;
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp35_ = item;
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _g_object_ref0 (_tmp35_);
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->cursor);
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
 					self->cursor = _tmp36_;
-#line 10395 "Page.c"
+#line 10077 "Page.c"
 				}
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10401 "Page.c"
+#line 10083 "Page.c"
 			}
-#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 10405 "Page.c"
+#line 10087 "Page.c"
 			{
 				ViewCollection* _tmp37_ = NULL;
 				ViewCollection* _tmp38_ = NULL;
@@ -10410,92 +10092,92 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				CheckerboardItem* _tmp43_ = NULL;
 				CheckerboardItem* _tmp44_ = NULL;
 				CheckerboardItem* _tmp45_ = NULL;
-#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_;
-#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_unselect_all (_tmp38_);
-#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp38_);
-#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = self->anchor;
-#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp39_ == NULL) {
-#line 10426 "Page.c"
+#line 10108 "Page.c"
 					CheckerboardItem* _tmp40_ = NULL;
 					CheckerboardItem* _tmp41_ = NULL;
-#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp40_ = item;
-#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp41_ = _g_object_ref0 (_tmp40_);
-#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp41_;
-#line 10437 "Page.c"
+#line 10119 "Page.c"
 				}
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = self->anchor;
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = item;
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp42_, _tmp43_);
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = item;
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp45_ = _g_object_ref0 (_tmp44_);
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp45_;
-#line 1576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10455 "Page.c"
+#line 10137 "Page.c"
 			}
-#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 10459 "Page.c"
+#line 10141 "Page.c"
 			{
 				CheckerboardItem* _tmp46_ = NULL;
 				CheckerboardItem* _tmp49_ = NULL;
 				CheckerboardItem* _tmp50_ = NULL;
 				CheckerboardItem* _tmp51_ = NULL;
 				CheckerboardItem* _tmp52_ = NULL;
-#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp46_ = self->anchor;
-#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp46_ == NULL) {
-#line 10470 "Page.c"
+#line 10152 "Page.c"
 					CheckerboardItem* _tmp47_ = NULL;
 					CheckerboardItem* _tmp48_ = NULL;
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1546 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp47_ = item;
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1546 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp48_ = _g_object_ref0 (_tmp47_);
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1546 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1546 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp48_;
-#line 10481 "Page.c"
+#line 10163 "Page.c"
 				}
-#line 1586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp49_ = self->anchor;
-#line 1586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp50_ = item;
-#line 1586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp49_, _tmp50_);
-#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp51_ = item;
-#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp52_ = _g_object_ref0 (_tmp51_);
-#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp52_;
-#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10499 "Page.c"
+#line 10181 "Page.c"
 			}
 			default:
 			{
@@ -10505,34 +10187,34 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				CheckerboardItem* _tmp77_ = NULL;
 				CheckerboardItem* _tmp78_ = NULL;
 				CheckerboardItem* _tmp79_ = NULL;
-#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp53_ = event;
-#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp54_ = _tmp53_->type;
-#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp54_ == GDK_2BUTTON_PRESS) {
-#line 10515 "Page.c"
+#line 10197 "Page.c"
 					CheckerboardItem* _tmp55_ = NULL;
 					CheckerboardItem* _tmp56_ = NULL;
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp55_ = item;
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp56_ = _g_object_ref0 (_tmp55_);
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->priv->activated_item);
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->activated_item = _tmp56_;
-#line 10526 "Page.c"
+#line 10208 "Page.c"
 				} else {
 					CheckerboardItem* _tmp57_ = NULL;
 					gboolean _tmp58_ = FALSE;
-#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp57_ = item;
-#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp58_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_DATA_VIEW, DataView));
-#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
 					if (!_tmp58_) {
-#line 10536 "Page.c"
+#line 10218 "Page.c"
 						Marker* all = NULL;
 						ViewCollection* _tmp59_ = NULL;
 						ViewCollection* _tmp60_ = NULL;
@@ -10551,91 +10233,91 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 						CheckerboardItem* _tmp73_ = NULL;
 						Marker* _tmp74_ = NULL;
 						Marker* _tmp75_ = NULL;
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp59_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp60_ = _tmp59_;
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp62_ = _tmp61_;
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp60_);
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 						all = _tmp62_;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp63_ = all;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp64_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp65_ = _tmp64_;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp66_ = view_collection_get_selected (_tmp65_);
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp67_ = _tmp66_;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 						marker_mark_many (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp67_);
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp65_);
-#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp68_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp69_ = _tmp68_;
-#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp70_ = all;
-#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp71_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp72_ = _tmp71_;
-#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp73_ = item;
-#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp74_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_DATA_OBJECT, DataObject));
-#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp75_ = _tmp74_;
-#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 						view_collection_unselect_and_select_marked (_tmp69_, _tmp70_, _tmp75_);
-#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp75_);
-#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp72_);
-#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp69_);
-#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (all);
-#line 10609 "Page.c"
+#line 10291 "Page.c"
 					}
 				}
-#line 1607 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp76_ = item;
-#line 1607 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp77_ = _g_object_ref0 (_tmp76_);
-#line 1607 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1607 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = _tmp77_;
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp78_ = item;
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp79_ = _g_object_ref0 (_tmp78_);
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp79_;
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10630 "Page.c"
+#line 10312 "Page.c"
 			}
 		}
-#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = self->priv->layout;
-#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = item;
-#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_cursor (_tmp80_, _tmp81_);
-#line 10639 "Page.c"
+#line 10321 "Page.c"
 	} else {
 		guint _tmp82_ = 0U;
 		GeeArrayList* _tmp85_ = NULL;
@@ -10644,30 +10326,30 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 		gdouble _tmp103_ = 0.0;
 		GdkEventButton* _tmp104_ = NULL;
 		gdouble _tmp105_ = 0.0;
-#line 1615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp82_ = state;
-#line 1615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp82_ != ((guint) GDK_CONTROL_MASK)) {
-#line 10652 "Page.c"
+#line 10334 "Page.c"
 			ViewCollection* _tmp83_ = NULL;
 			ViewCollection* _tmp84_ = NULL;
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp83_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp84_ = _tmp83_;
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all (_tmp84_);
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp84_);
-#line 10663 "Page.c"
+#line 10345 "Page.c"
 		}
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/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);
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->previously_selected);
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->previously_selected = _tmp85_;
-#line 10671 "Page.c"
+#line 10353 "Page.c"
 		{
 			GeeList* _view_list = NULL;
 			ViewCollection* _tmp86_ = NULL;
@@ -10679,31 +10361,31 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 			gint _tmp91_ = 0;
 			gint _tmp92_ = 0;
 			gint _view_index = 0;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp86_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp87_ = _tmp86_;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp88_ = view_collection_get_selected (_tmp87_);
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp89_ = _tmp88_;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp87_);
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_list = _tmp89_;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp90_ = _view_list;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp91_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp92_ = _tmp91_;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_size = _tmp92_;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_index = -1;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 			while (TRUE) {
-#line 10707 "Page.c"
+#line 10389 "Page.c"
 				gint _tmp93_ = 0;
 				gint _tmp94_ = 0;
 				gint _tmp95_ = 0;
@@ -10713,79 +10395,79 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				gpointer _tmp98_ = NULL;
 				GeeArrayList* _tmp99_ = NULL;
 				DataView* _tmp100_ = NULL;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp93_ = _view_index;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				_view_index = _tmp93_ + 1;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp94_ = _view_index;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp95_ = _view_size;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!(_tmp94_ < _tmp95_)) {
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 10729 "Page.c"
+#line 10411 "Page.c"
 				}
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp96_ = _view_list;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp97_ = _view_index;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp98_ = gee_list_get (_tmp96_, _tmp97_);
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				view = (DataView*) _tmp98_;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp99_ = self->priv->previously_selected;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp100_ = view;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (view);
-#line 10747 "Page.c"
+#line 10429 "Page.c"
 			}
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_view_list);
-#line 10751 "Page.c"
+#line 10433 "Page.c"
 		}
-#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp101_ = self->priv->layout;
-#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp102_ = event;
-#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp103_ = _tmp102_->x;
-#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp104_ = event;
-#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp105_ = _tmp104_->y;
-#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_drag_select_origin (_tmp101_, (gint) _tmp103_, (gint) _tmp105_);
-#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10771 "Page.c"
+#line 10453 "Page.c"
 	}
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp106_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp107_ = _tmp106_;
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp108_ = view_collection_get_selected_count (_tmp107_);
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp109_ = _tmp108_ == 0;
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp107_);
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp109_;
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10789 "Page.c"
+#line 10471 "Page.c"
 }
 
 
@@ -10806,152 +10488,152 @@ static gboolean checkerboard_page_real_on_left_released (Page* base, GdkEventBut
 	CheckerboardItem* _tmp15_ = NULL;
 	CheckerboardItem* _tmp16_ = NULL;
 	CheckerboardItem* _tmp17_ = NULL;
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 10824 "Page.c"
+#line 10506 "Page.c"
 		CheckerboardLayout* _tmp2_ = NULL;
 		CheckerboardItem* _tmp3_ = NULL;
 		CheckerboardItem* _tmp4_ = NULL;
-#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_clear_drag_select (_tmp2_);
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->cursor;
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp4_;
-#line 1642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10844 "Page.c"
+#line 10526 "Page.c"
 	}
-#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0) {
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10856 "Page.c"
+#line 10538 "Page.c"
 	}
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->activated_item;
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 10862 "Page.c"
+#line 10544 "Page.c"
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardPageKeyboardModifiers _tmp9_ = {0};
-#line 1651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->activated_item;
-#line 1651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_keyboard_modifiers_init (&_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_on_item_activated (self, _tmp8_, CHECKERBOARD_PAGE_ACTIVATOR_MOUSE, &_tmp9_);
-#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->activated_item);
-#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->activated_item = NULL;
-#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10879 "Page.c"
+#line 10561 "Page.c"
 	}
-#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = event;
-#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_->x;
-#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = event;
-#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_->y;
-#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = checkerboard_page_get_item_at_pixel (self, _tmp11_, _tmp13_);
-#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp14_;
-#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = item;
-#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_ == NULL) {
-#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10903 "Page.c"
+#line 10585 "Page.c"
 	}
-#line 1663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->cursor;
-#line 1663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = item;
-#line 1663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp16_ != _tmp17_) {
-#line 10911 "Page.c"
+#line 10593 "Page.c"
 		ViewCollection* _tmp18_ = NULL;
 		ViewCollection* _tmp19_ = NULL;
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = _tmp18_;
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp19_);
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp19_);
-#line 10922 "Page.c"
+#line 10604 "Page.c"
 	} else {
 		CheckerboardItem* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = item;
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_VIEW, DataView));
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 10932 "Page.c"
+#line 10614 "Page.c"
 			ViewCollection* _tmp22_ = NULL;
 			ViewCollection* _tmp23_ = NULL;
 			CheckerboardItem* _tmp24_ = NULL;
-#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_;
-#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = item;
-#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all_but (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_VIEW, DataView));
-#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp23_);
-#line 10946 "Page.c"
+#line 10628 "Page.c"
 		}
 	}
-#line 1676 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1676 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1676 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10955 "Page.c"
+#line 10637 "Page.c"
 }
 
 
@@ -10972,50 +10654,50 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 	GtkMenu* _tmp40_ = NULL;
 	GdkEventButton* _tmp41_ = NULL;
 	gboolean _tmp42_ = FALSE;
-#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->type;
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != GDK_BUTTON_PRESS) {
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10990 "Page.c"
+#line 10672 "Page.c"
 	}
-#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->x;
-#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->y;
-#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = checkerboard_page_get_item_at_pixel (self, _tmp3_, _tmp5_);
-#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp6_;
-#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 11008 "Page.c"
+#line 10690 "Page.c"
 		GdkEventButton* _tmp8_ = NULL;
 		GdkModifierType _tmp9_ = 0;
-#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = event;
-#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_->state;
-#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp9_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
-#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 11019 "Page.c"
+#line 10701 "Page.c"
 			{
 				Marker* marker = NULL;
 				ViewCollection* _tmp10_ = NULL;
@@ -11026,63 +10708,63 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 				ViewCollection* _tmp15_ = NULL;
 				ViewCollection* _tmp16_ = NULL;
 				Marker* _tmp17_ = NULL;
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = _tmp10_;
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = item;
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = _tmp13_;
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp11_);
-#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp14_;
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = _tmp15_;
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp17_ = marker;
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp16_, _tmp17_);
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp16_);
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11058 "Page.c"
+#line 10740 "Page.c"
 			}
-#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 11062 "Page.c"
+#line 10744 "Page.c"
 			{
-#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11066 "Page.c"
+#line 10748 "Page.c"
 			}
-#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 11070 "Page.c"
+#line 10752 "Page.c"
 			{
-#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1663 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11074 "Page.c"
+#line 10756 "Page.c"
 			}
 			default:
 			{
 				CheckerboardItem* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = item;
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_VIEW, DataView));
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp19_) {
-#line 11086 "Page.c"
+#line 10768 "Page.c"
 					Marker* all = NULL;
 					ViewCollection* _tmp20_ = NULL;
 					ViewCollection* _tmp21_ = NULL;
@@ -11101,99 +10783,99 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 					CheckerboardItem* _tmp34_ = NULL;
 					Marker* _tmp35_ = NULL;
 					Marker* _tmp36_ = NULL;
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp21_ = _tmp20_;
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp23_ = _tmp22_;
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp21_);
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1669 "/home/jens/Source/shotwell/src/Page.vala"
 					all = _tmp23_;
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = all;
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp26_ = _tmp25_;
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = view_collection_get_selected (_tmp26_);
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp28_ = _tmp27_;
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
 					marker_mark_many (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp28_);
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp26_);
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = _tmp29_;
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = all;
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = _tmp32_;
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = item;
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp35_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_OBJECT, DataObject));
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _tmp35_;
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 					view_collection_unselect_and_select_marked (_tmp30_, _tmp31_, _tmp36_);
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp36_);
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp33_);
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp30_);
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (all);
-#line 11159 "Page.c"
+#line 10841 "Page.c"
 				}
-#line 1712 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11163 "Page.c"
+#line 10845 "Page.c"
 			}
 		}
 	} else {
 		ViewCollection* _tmp37_ = NULL;
 		ViewCollection* _tmp38_ = NULL;
-#line 1716 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1678 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1716 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1678 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = _tmp37_;
-#line 1716 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1678 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp38_);
-#line 1716 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1678 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 11177 "Page.c"
+#line 10859 "Page.c"
 	}
-#line 1719 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = checkerboard_page_get_context_menu (self);
-#line 1719 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 	context_menu = _tmp39_;
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = context_menu;
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = event;
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp40_, _tmp41_);
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp42_;
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (context_menu);
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11197 "Page.c"
+#line 10879 "Page.c"
 }
 
 
@@ -11207,105 +10889,105 @@ static gboolean checkerboard_page_real_on_mouse_over (CheckerboardPage* self, Ch
 	CheckerboardItem* _tmp11_ = NULL;
 	CheckerboardItem* _tmp12_ = NULL;
 	CheckerboardItem* _tmp13_ = NULL;
-#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((item == NULL) || IS_CHECKERBOARD_ITEM (item), FALSE);
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = item;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 11217 "Page.c"
+#line 10899 "Page.c"
 		CheckerboardLayout* _tmp1_ = NULL;
 		CheckerboardItem* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		GdkModifierType _tmp5_ = 0;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->layout;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = item;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = x;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = y;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = mask;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_handle_mouse_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 11235 "Page.c"
+#line 10917 "Page.c"
 	}
-#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = item;
-#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->highlighted;
-#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == _tmp7_) {
-#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11247 "Page.c"
+#line 10929 "Page.c"
 	}
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1695 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->highlighted;
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1695 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_ != NULL) {
-#line 11253 "Page.c"
+#line 10935 "Page.c"
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->highlighted;
-#line 1734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_item_unbrighten (_tmp9_);
-#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->highlighted);
-#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->highlighted = NULL;
-#line 11263 "Page.c"
+#line 10945 "Page.c"
 	}
-#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = item;
-#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp10_ == NULL) {
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11273 "Page.c"
+#line 10955 "Page.c"
 	}
-#line 1743 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = item;
-#line 1743 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_item_brighten (_tmp11_);
-#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = _tmp13_;
-#line 1746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11291 "Page.c"
+#line 10973 "Page.c"
 }
 
 
 gboolean checkerboard_page_on_mouse_over (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask) {
-#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->on_mouse_over (self, item, x, y, mask);
-#line 11300 "Page.c"
+#line 10982 "Page.c"
 }
 
 
 static gboolean _checkerboard_page_selection_autoscroll_gsource_func (gpointer self) {
 	gboolean result;
 	result = checkerboard_page_selection_autoscroll ((CheckerboardPage*) self);
-#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11309 "Page.c"
+#line 10991 "Page.c"
 }
 
 
@@ -11328,95 +11010,95 @@ static gboolean checkerboard_page_real_on_motion (Page* base, GdkEventMotion* ev
 	gint _tmp13_ = 0;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp15_ = FALSE;
-#line 1749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = checkerboard_page_get_item_at_pixel (self, (gdouble) _tmp0_, (gdouble) _tmp1_);
-#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = x;
-#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = y;
-#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = mask;
-#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = checkerboard_page_on_mouse_over (self, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = !_tmp7_;
-#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_) {
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11362 "Page.c"
+#line 11044 "Page.c"
 	}
-#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->layout;
-#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = checkerboard_layout_is_drag_select_active (_tmp9_);
-#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp10_) {
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11374 "Page.c"
+#line 11056 "Page.c"
 	}
-#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = x;
-#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = y;
-#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_drag_select_endpoint (_tmp11_, _tmp12_, _tmp13_);
-#line 1761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->autoscroll_scheduled;
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp15_) {
-#line 11390 "Page.c"
+#line 11072 "Page.c"
 		GtkAdjustment* _tmp16_ = NULL;
 		gint _tmp17_ = 0;
 		AdjustmentRelation _tmp18_ = 0;
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = y;
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp16_, _tmp17_);
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp18_ != ADJUSTMENT_RELATION_IN_RANGE;
-#line 11402 "Page.c"
+#line 11084 "Page.c"
 	} else {
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = FALSE;
-#line 11406 "Page.c"
+#line 11088 "Page.c"
 	}
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp14_) {
-#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Page.vala"
 		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) CHECKERBOARD_PAGE_AUTOSCROLL_TICKS_MSEC, _checkerboard_page_selection_autoscroll_gsource_func, g_object_ref (self), g_object_unref);
-#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = TRUE;
-#line 11414 "Page.c"
+#line 11096 "Page.c"
 	}
-#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11420 "Page.c"
+#line 11102 "Page.c"
 }
 
 
@@ -11453,91 +11135,91 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 	ViewCollection* _tmp47_ = NULL;
 	ViewCollection* _tmp48_ = NULL;
 	Marker* _tmp49_ = NULL;
-#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_, "layout.is_drag_select_active()");
-#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->layout;
-#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_items_in_selection_band (_tmp2_);
-#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	intersection = _tmp3_;
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = intersection;
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1742 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (intersection);
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1742 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11479 "Page.c"
+#line 11161 "Page.c"
 	}
-#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	to_unselect = _tmp8_;
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_;
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = _tmp11_;
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 	to_select = _tmp12_;
-#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = to_unselect;
-#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = view_collection_get_selected (_tmp15_);
-#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = _tmp16_;
-#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp17_);
-#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp15_);
-#line 1789 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->previously_selected;
-#line 1789 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp18_ != NULL, "previously_selected != null");
-#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = to_unselect;
-#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = self->priv->previously_selected;
-#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_unmark_many (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = to_select;
-#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = self->priv->previously_selected;
-#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 11541 "Page.c"
+#line 11223 "Page.c"
 	{
 		GeeList* _item_list = NULL;
 		GeeList* _tmp23_ = NULL;
@@ -11547,25 +11229,25 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
 		gint _item_index = 0;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = intersection;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_list = _tmp24_;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = _item_list;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = _tmp26_;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_size = _tmp27_;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_index = -1;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 11569 "Page.c"
+#line 11251 "Page.c"
 			gint _tmp28_ = 0;
 			gint _tmp29_ = 0;
 			gint _tmp30_ = 0;
@@ -11577,109 +11259,109 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 			CheckerboardItem* _tmp35_ = NULL;
 			gboolean _tmp36_ = FALSE;
 			CheckerboardItem* _tmp41_ = NULL;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _item_index;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 			_item_index = _tmp28_ + 1;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _item_index;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _item_size;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!(_tmp29_ < _tmp30_)) {
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11593 "Page.c"
+#line 11275 "Page.c"
 			}
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = _item_list;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp32_ = _item_index;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = gee_list_get (_tmp31_, _tmp32_);
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 			item = (CheckerboardItem*) _tmp33_;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = to_select;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = item;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp36_ = marker_toggle (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_DATA_OBJECT, DataObject));
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp36_) {
-#line 11611 "Page.c"
+#line 11293 "Page.c"
 				Marker* _tmp37_ = NULL;
 				CheckerboardItem* _tmp38_ = NULL;
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = to_unselect;
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = item;
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_unmark (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject));
-#line 11620 "Page.c"
+#line 11302 "Page.c"
 			} else {
 				Marker* _tmp39_ = NULL;
 				CheckerboardItem* _tmp40_ = NULL;
-#line 1800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = to_unselect;
-#line 1800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = item;
-#line 1800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_mark (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_OBJECT, DataObject));
-#line 11630 "Page.c"
+#line 11312 "Page.c"
 			}
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->cursor;
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ == NULL) {
-#line 11636 "Page.c"
+#line 11318 "Page.c"
 				CheckerboardItem* _tmp42_ = NULL;
 				CheckerboardItem* _tmp43_ = NULL;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = item;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _g_object_ref0 (_tmp42_);
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp43_;
-#line 11647 "Page.c"
+#line 11329 "Page.c"
 			}
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 11651 "Page.c"
+#line 11333 "Page.c"
 		}
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_item_list);
-#line 11655 "Page.c"
+#line 11337 "Page.c"
 	}
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = _tmp44_;
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = to_select;
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp45_, _tmp46_);
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp45_);
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = _tmp47_;
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = to_unselect;
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_marked (_tmp48_, _tmp49_);
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp48_);
-#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_select);
-#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_unselect);
-#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (intersection);
-#line 11683 "Page.c"
+#line 11365 "Page.c"
 }
 
 
@@ -11711,77 +11393,77 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self)
 	GtkAdjustment* _tmp28_ = NULL;
 	gdouble _tmp29_ = 0.0;
 	gint _tmp30_ = 0;
-#line 1810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1773 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1773 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1773 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp1_) {
-#line 1812 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = FALSE;
-#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11729 "Page.c"
+#line 11411 "Page.c"
 	}
-#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp3_;
-#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_event_source_pointer (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), &_tmp4_, &_tmp5_, &_tmp6_);
-#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
 	x = _tmp4_;
-#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
 	y = _tmp5_;
-#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
 	mask = _tmp6_;
-#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = vadj;
-#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = gtk_adjustment_get_value (_tmp7_);
-#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	new_value = (gint) _tmp8_;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = vadj;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = y;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = get_adjustment_relation (_tmp9_, _tmp10_);
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp11_) {
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_BELOW:
-#line 11761 "Page.c"
+#line 11443 "Page.c"
 		{
 			gint _tmp12_ = 0;
 			CheckerboardLayout* _tmp13_ = NULL;
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
-#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = new_value;
-#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp12_ - CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = self->priv->layout;
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = x;
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = new_value;
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp13_, _tmp14_, _tmp15_);
-#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11781 "Page.c"
+#line 11463 "Page.c"
 		}
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_ABOVE:
-#line 11785 "Page.c"
+#line 11467 "Page.c"
 		{
 			gint _tmp16_ = 0;
 			CheckerboardLayout* _tmp17_ = NULL;
@@ -11789,78 +11471,78 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self)
 			gint _tmp19_ = 0;
 			GtkAdjustment* _tmp20_ = NULL;
 			gdouble _tmp21_ = 0.0;
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = new_value;
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp16_ + CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = self->priv->layout;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = x;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = new_value;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = vadj;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = gtk_adjustment_get_page_size (_tmp20_);
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp17_, _tmp18_, _tmp19_ + ((gint) _tmp21_));
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11811 "Page.c"
+#line 11493 "Page.c"
 		}
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_IN_RANGE:
-#line 11815 "Page.c"
+#line 11497 "Page.c"
 		{
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->autoscroll_scheduled = FALSE;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (vadj);
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 11825 "Page.c"
+#line 11507 "Page.c"
 		}
 		default:
 		{
-#line 1844 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
 			g_warn_if_reached ();
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11833 "Page.c"
+#line 11515 "Page.c"
 		}
 	}
-#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = new_value;
-#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = vadj;
-#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = gtk_adjustment_get_lower (_tmp24_);
-#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = vadj;
-#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = gtk_adjustment_get_upper (_tmp26_);
-#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = vadj;
-#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = gtk_adjustment_get_page_size (_tmp28_);
-#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = CLAMP (_tmp23_, (gint) _tmp25_, ((gint) _tmp27_) - ((gint) _tmp29_));
-#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp22_, (gdouble) _tmp30_);
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1816 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11864 "Page.c"
+#line 11546 "Page.c"
 }
 
 
@@ -11891,35 +11573,35 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 	gdouble _tmp39_ = 0.0;
 	GtkAdjustment* _tmp53_ = NULL;
 	gint _tmp54_ = 0;
-#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_, "get_view().contains(item)");
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = item;
-#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp5_;
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp6_) {
-#line 11923 "Page.c"
+#line 11605 "Page.c"
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		Marker* marker = NULL;
@@ -11931,67 +11613,67 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		ViewCollection* _tmp14_ = NULL;
 		ViewCollection* _tmp15_ = NULL;
 		Marker* _tmp16_ = NULL;
-#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp8_);
-#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_;
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = item;
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject));
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_;
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
 		marker = _tmp13_;
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _tmp14_;
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = marker;
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_select_marked (_tmp15_, _tmp16_);
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp15_);
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (marker);
-#line 11969 "Page.c"
+#line 11651 "Page.c"
 	}
-#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->layout;
-#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = item;
-#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_cursor (_tmp17_, _tmp18_);
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp20_;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = item;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = _tmp23_->allocation;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = _tmp24_.y;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = get_adjustment_relation (_tmp22_, _tmp25_);
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp26_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 11995 "Page.c"
+#line 11677 "Page.c"
 		GtkAdjustment* _tmp27_ = NULL;
 		CheckerboardItem* _tmp28_ = NULL;
 		GdkRectangle _tmp29_ = {0};
@@ -12000,70 +11682,70 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		GdkRectangle _tmp32_ = {0};
 		gint _tmp33_ = 0;
 		AdjustmentRelation _tmp34_ = 0;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = vadj;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = item;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_->allocation;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.y;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = item;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_->allocation;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = _tmp32_.height;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = get_adjustment_relation (_tmp27_, _tmp30_ + _tmp33_);
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = _tmp34_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 12022 "Page.c"
+#line 11704 "Page.c"
 	} else {
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = FALSE;
-#line 12026 "Page.c"
+#line 11708 "Page.c"
 	}
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_) {
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1837 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1837 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12034 "Page.c"
+#line 11716 "Page.c"
 	}
-#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	top = 0;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = item;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_->allocation;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = _tmp36_.y;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = vadj;
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = gtk_adjustment_get_value (_tmp38_);
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((gdouble) _tmp37_) < _tmp39_) {
-#line 12050 "Page.c"
+#line 11732 "Page.c"
 		CheckerboardItem* _tmp40_ = NULL;
 		GdkRectangle _tmp41_ = {0};
 		gint _tmp42_ = 0;
 		gint _tmp43_ = 0;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp40_ = item;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp41_ = _tmp40_->allocation;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp42_ = _tmp41_.y;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp42_;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp43_ = top;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp43_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 12067 "Page.c"
+#line 11749 "Page.c"
 	} else {
 		CheckerboardItem* _tmp44_ = NULL;
 		GdkRectangle _tmp45_ = {0};
@@ -12074,39 +11756,39 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		GtkAdjustment* _tmp50_ = NULL;
 		gdouble _tmp51_ = 0.0;
 		gint _tmp52_ = 0;
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = item;
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp45_ = _tmp44_->allocation;
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp45_.y;
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = item;
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = _tmp47_->allocation;
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.height;
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = vadj;
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = gtk_adjustment_get_page_size (_tmp50_);
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		top = (_tmp46_ + _tmp49_) - ((gint) _tmp51_);
-#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = top;
-#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp52_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 12100 "Page.c"
+#line 11782 "Page.c"
 	}
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp53_ = vadj;
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp54_ = top;
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp53_, (gdouble) _tmp54_);
-#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 12110 "Page.c"
+#line 11792 "Page.c"
 }
 
 
@@ -12125,171 +11807,171 @@ void checkerboard_page_move_cursor (CheckerboardPage* self, CompassPoint point)
 	CompassPoint _tmp27_ = 0;
 	CheckerboardItem* _tmp28_ = NULL;
 	CheckerboardItem* _tmp29_ = NULL;
-#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12145 "Page.c"
+#line 11827 "Page.c"
 	}
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->cursor;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 12151 "Page.c"
+#line 11833 "Page.c"
 		CheckerboardLayout* _tmp7_ = NULL;
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->layout;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_layout_get_cursor (_tmp7_);
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp9_ == NULL;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp9_);
-#line 12165 "Page.c"
+#line 11847 "Page.c"
 	} else {
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = FALSE;
-#line 12169 "Page.c"
+#line 11851 "Page.c"
 	}
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 12175 "Page.c"
+#line 11857 "Page.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
 		CheckerboardItem* _tmp11_ = NULL;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->cursor;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp11_ != NULL) {
-#line 12183 "Page.c"
+#line 11865 "Page.c"
 			ViewCollection* _tmp12_ = NULL;
 			ViewCollection* _tmp13_ = NULL;
 			CheckerboardItem* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp12_;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->cursor;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = !_tmp15_;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp13_);
-#line 12200 "Page.c"
+#line 11882 "Page.c"
 		} else {
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = FALSE;
-#line 12204 "Page.c"
+#line 11886 "Page.c"
 		}
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp10_;
-#line 12208 "Page.c"
+#line 11890 "Page.c"
 	}
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 12212 "Page.c"
+#line 11894 "Page.c"
 		CheckerboardItem* item = NULL;
 		CheckerboardLayout* _tmp16_ = NULL;
 		CheckerboardItem* _tmp17_ = NULL;
 		CheckerboardItem* _tmp18_ = NULL;
 		CheckerboardItem* _tmp19_ = NULL;
 		CheckerboardItem* _tmp20_ = NULL;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->layout;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = checkerboard_layout_get_item_at_coordinate (_tmp16_, 0, 0);
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp17_;
-#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = item;
-#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp18_);
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = item;
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp20_;
-#line 1903 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1903 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12241 "Page.c"
+#line 11923 "Page.c"
 	}
-#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = self->cursor;
-#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_ == NULL) {
-#line 12247 "Page.c"
+#line 11929 "Page.c"
 		CheckerboardLayout* _tmp22_ = NULL;
 		CheckerboardItem* _tmp23_ = NULL;
 		CheckerboardItem* _tmp24_ = NULL;
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->layout;
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = checkerboard_layout_get_cursor (_tmp22_);
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_CHECKERBOARD_ITEM) ? ((CheckerboardItem*) _tmp23_) : NULL;
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp24_ == NULL) {
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp23_);
-#line 12261 "Page.c"
+#line 11943 "Page.c"
 		}
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->cursor);
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 		self->cursor = _tmp24_;
-#line 12267 "Page.c"
+#line 11949 "Page.c"
 	}
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->layout;
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = self->cursor;
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = point;
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = checkerboard_layout_get_item_relative_to (_tmp25_, _tmp26_, _tmp27_);
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp28_;
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = item;
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_ != NULL) {
-#line 12283 "Page.c"
+#line 11965 "Page.c"
 		CheckerboardItem* _tmp30_ = NULL;
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = item;
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp30_);
-#line 12289 "Page.c"
+#line 11971 "Page.c"
 	}
-#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 12293 "Page.c"
+#line 11975 "Page.c"
 }
 
 
@@ -12306,51 +11988,51 @@ void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* ite
 	CheckerboardItem* _tmp8_ = NULL;
 	CheckerboardItem* _tmp9_ = NULL;
 	CheckerboardItem* _tmp10_ = NULL;
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp4_;
-#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp6_, marker);
-#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp8_;
-#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = item;
-#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = _tmp10_;
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 12354 "Page.c"
+#line 12036 "Page.c"
 }
 
 
@@ -12365,29 +12047,29 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 	ViewCollection* _tmp28_ = NULL;
 	ViewCollection* _tmp29_ = NULL;
 	Marker* _tmp30_ = NULL;
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_start));
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_end));
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp3_;
-#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_start = FALSE;
-#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_end = FALSE;
-#line 12391 "Page.c"
+#line 12073 "Page.c"
 	{
 		GeeIterator* _object_it = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -12396,27 +12078,27 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 		GeeCollection* _tmp7_ = NULL;
 		GeeIterator* _tmp8_ = NULL;
 		GeeIterator* _tmp9_ = NULL;
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 		_object_it = _tmp9_;
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 12420 "Page.c"
+#line 12102 "Page.c"
 			GeeIterator* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
 			DataObject* object = NULL;
@@ -12433,125 +12115,125 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 			gboolean _tmp21_ = FALSE;
 			gboolean _tmp25_ = FALSE;
 			gboolean _tmp26_ = FALSE;
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = _object_it;
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp11_) {
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12445 "Page.c"
+#line 12127 "Page.c"
 			}
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _object_it;
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 			object = (DataObject*) _tmp13_;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = object;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp15_;
-#line 1933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = item_start;
-#line 1933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = item;
-#line 1933 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp16_ == _tmp17_) {
-#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_start = TRUE;
-#line 12467 "Page.c"
+#line 12149 "Page.c"
 			}
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = item_end;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = item;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp18_ == _tmp19_) {
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_end = TRUE;
-#line 12477 "Page.c"
+#line 12159 "Page.c"
 			}
-#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = passed_start;
-#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = TRUE;
-#line 12485 "Page.c"
+#line 12167 "Page.c"
 			} else {
 				gboolean _tmp22_ = FALSE;
-#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = passed_end;
-#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp22_;
-#line 12492 "Page.c"
+#line 12174 "Page.c"
 			}
-#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp20_) {
-#line 12496 "Page.c"
+#line 12178 "Page.c"
 				Marker* _tmp23_ = NULL;
 				DataObject* _tmp24_ = NULL;
-#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = marker;
-#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = object;
-#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_VIEW, DataView), TYPE_DATA_OBJECT, DataObject));
-#line 12505 "Page.c"
+#line 12187 "Page.c"
 			}
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = passed_start;
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp26_) {
-#line 12511 "Page.c"
+#line 12193 "Page.c"
 				gboolean _tmp27_ = FALSE;
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = passed_end;
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = _tmp27_;
-#line 12517 "Page.c"
+#line 12199 "Page.c"
 			} else {
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = FALSE;
-#line 12521 "Page.c"
+#line 12203 "Page.c"
 			}
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp25_) {
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (item);
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (object);
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12531 "Page.c"
+#line 12213 "Page.c"
 			}
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (object);
-#line 12537 "Page.c"
+#line 12219 "Page.c"
 		}
-#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_object_it);
-#line 12541 "Page.c"
+#line 12223 "Page.c"
 	}
-#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = _tmp28_;
-#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = marker;
-#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp29_, _tmp30_);
-#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp29_);
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 12555 "Page.c"
+#line 12237 "Page.c"
 }
 
 
@@ -12559,65 +12241,65 @@ void checkerboard_page_select_anchor_to_cursor (CheckerboardPage* self, guint st
 	gboolean _tmp0_ = FALSE;
 	CheckerboardItem* _tmp1_ = NULL;
 	guint _tmp3_ = 0U;
-#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->cursor;
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 12571 "Page.c"
+#line 12253 "Page.c"
 	} else {
 		CheckerboardItem* _tmp2_ = NULL;
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->anchor;
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 12578 "Page.c"
+#line 12260 "Page.c"
 	}
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12584 "Page.c"
+#line 12266 "Page.c"
 	}
-#line 1953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1915 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = state;
-#line 1953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1915 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == ((guint) GDK_SHIFT_MASK)) {
-#line 12590 "Page.c"
+#line 12272 "Page.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		CheckerboardItem* _tmp6_ = NULL;
 		CheckerboardItem* _tmp7_ = NULL;
-#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp5_);
-#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->anchor;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->cursor;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_select_between_items (self, _tmp6_, _tmp7_);
-#line 12609 "Page.c"
+#line 12291 "Page.c"
 	} else {
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->cursor;
-#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp9_;
-#line 12621 "Page.c"
+#line 12303 "Page.c"
 	}
 }
 
@@ -12631,48 +12313,48 @@ static void checkerboard_page_real_set_display_titles (CheckerboardPage* self, g
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
-#line 1962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_TITLES, &_tmp5_, NULL, NULL);
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12667 "Page.c"
+#line 12349 "Page.c"
 }
 
 
 void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display) {
-#line 1961 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1961 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_titles (self, display);
-#line 12676 "Page.c"
+#line 12358 "Page.c"
 }
 
 
@@ -12685,48 +12367,48 @@ static void checkerboard_page_real_set_display_comments (CheckerboardPage* self,
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
-#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS, &_tmp5_, NULL, NULL);
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12721 "Page.c"
+#line 12403 "Page.c"
 }
 
 
 void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display) {
-#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_comments (self, display);
-#line 12730 "Page.c"
+#line 12412 "Page.c"
 }
 
 
@@ -12739,54 +12421,54 @@ void checkerboard_page_keyboard_modifiers_init (CheckerboardPageKeyboardModifier
 	gboolean _tmp5_ = FALSE;
 	Page* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (self, 0, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_ctrl_pressed (_tmp0_);
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).ctrl_pressed = _tmp1_;
-#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page;
-#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_alt_pressed (_tmp2_);
-#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).alt_pressed = _tmp3_;
-#line 1253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page;
-#line 1253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_shift_pressed (_tmp4_);
-#line 1253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).shift_pressed = _tmp5_;
-#line 1254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page;
-#line 1254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = page_get_super_pressed (_tmp6_);
-#line 1254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).super_pressed = _tmp7_;
-#line 12771 "Page.c"
+#line 12453 "Page.c"
 }
 
 
 CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (const CheckerboardPageKeyboardModifiers* self) {
 	CheckerboardPageKeyboardModifiers* dup;
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (CheckerboardPageKeyboardModifiers, 1);
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 12783 "Page.c"
+#line 12465 "Page.c"
 }
 
 
 void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self) {
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
 	g_free (self);
-#line 12790 "Page.c"
+#line 12472 "Page.c"
 }
 
 
@@ -12802,113 +12484,113 @@ GType checkerboard_page_keyboard_modifiers_get_type (void) {
 
 
 static void checkerboard_page_class_init (CheckerboardPageClass * klass) {
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_parent_class = g_type_class_peek_parent (klass);
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardPagePrivate));
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_item_context_menu = checkerboard_page_real_get_item_context_menu;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->get_page_context_menu = checkerboard_page_real_get_page_context_menu;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = checkerboard_page_real_on_context_keypress;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_view_empty_message = checkerboard_page_real_get_view_empty_message;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_filter_no_match_message = checkerboard_page_real_get_filter_no_match_message;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->on_item_activated = checkerboard_page_real_on_item_activated;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_search_view_filter = checkerboard_page_real_get_search_view_filter;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_view_tracker = checkerboard_page_real_get_view_tracker;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switching_from = checkerboard_page_real_switching_from;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = checkerboard_page_real_switched_to;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_page_name = checkerboard_page_real_set_page_name;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->key_press_event = checkerboard_page_real_key_press_event;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_click = checkerboard_page_real_on_left_click;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_released = checkerboard_page_real_on_left_released;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_right_click = checkerboard_page_real_on_right_click;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->on_mouse_over = checkerboard_page_real_on_mouse_over;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_motion = checkerboard_page_real_on_motion;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->set_display_titles = checkerboard_page_real_set_display_titles;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->set_display_comments = checkerboard_page_real_set_display_comments;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = checkerboard_page_finalize;
-#line 12850 "Page.c"
+#line 12532 "Page.c"
 }
 
 
 static void checkerboard_page_instance_init (CheckerboardPage * self) {
 	GtkViewport* _tmp0_ = NULL;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = CHECKERBOARD_PAGE_GET_PRIVATE (self);
-#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1196 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = NULL;
-#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = NULL;
-#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->viewport = _tmp0_;
-#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = NULL;
-#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = NULL;
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->autoscroll_scheduled = FALSE;
-#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->activated_item = NULL;
-#line 1242 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 12880 "Page.c"
+#line 12562 "Page.c"
 }
 
 
 static void checkerboard_page_finalize (GObject* obj) {
 	CheckerboardPage * self;
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1196 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->viewport);
-#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->activated_item);
-#line 1242 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1271 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->item_context_menu);
-#line 1321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->page_context_menu);
-#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (checkerboard_page_parent_class)->finalize (obj);
-#line 12912 "Page.c"
+#line 12594 "Page.c"
 }
 
 
@@ -12937,18 +12619,18 @@ GType single_photo_page_update_reason_get_type (void) {
 
 
 static void _single_photo_page_on_viewport_resize_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) {
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_on_viewport_resize ((SinglePhotoPage*) self);
-#line 12943 "Page.c"
+#line 12625 "Page.c"
 }
 
 
 static gboolean _single_photo_page_on_canvas_exposed_gtk_widget_draw (GtkWidget* _sender, cairo_t* cr, gpointer self) {
 	gboolean result;
 	result = single_photo_page_on_canvas_exposed ((SinglePhotoPage*) self, cr);
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 12952 "Page.c"
+#line 12634 "Page.c"
 }
 
 
@@ -12968,71 +12650,71 @@ SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* pa
 	GtkViewport* _tmp11_ = NULL;
 	GtkDrawingArea* _tmp12_ = NULL;
 	GtkDrawingArea* _tmp13_ = NULL;
-#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (SinglePhotoPage*) page_construct (object_type, _tmp0_);
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = scale_up_to_viewport;
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scale_up_to_viewport = _tmp1_;
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = transition_effects_manager_get_instance ();
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = transition_effects_manager_create_null_transition_clock (_tmp3_);
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp4_;
-#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp3_);
-#line 2015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_scrolled_window_set_policy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1979 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_scrolled_window_set_shadow_type (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_SHADOW_NONE);
-#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp5_, GTK_SHADOW_NONE);
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->viewport;
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1984 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->viewport;
-#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1984 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->canvas;
-#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1984 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->viewport;
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2026 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->canvas;
-#line 2026 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), (gint) ((GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK) | GDK_SUBSTRUCTURE_MASK));
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->viewport;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _single_photo_page_on_viewport_resize_gtk_widget_size_allocate, self, 0);
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->canvas;
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), "draw", (GCallback) _single_photo_page_on_canvas_exposed_gtk_widget_draw, self, 0);
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->canvas;
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_event_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
-#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 13036 "Page.c"
+#line 12718 "Page.c"
 }
 
 
@@ -13040,38 +12722,38 @@ gboolean single_photo_page_is_transition_in_progress (SinglePhotoPage* self) {
 	gboolean result = FALSE;
 	TransitionClock* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1997 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13054 "Page.c"
+#line 12736 "Page.c"
 }
 
 
 void single_photo_page_cancel_transition (SinglePhotoPage* self) {
 	TransitionClock* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 13069 "Page.c"
+#line 12751 "Page.c"
 		TransitionClock* _tmp2_ = NULL;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->transition_clock;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
 		transition_clock_cancel (_tmp2_);
-#line 13075 "Page.c"
+#line 12757 "Page.c"
 	}
 }
 
@@ -13083,53 +12765,53 @@ void single_photo_page_set_transition (SinglePhotoPage* self, const gchar* effec
 	TransitionClock* _tmp3_ = NULL;
 	TransitionClock* _tmp4_ = NULL;
 	gint _tmp8_ = 0;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (effect_id != NULL);
-#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = transition_effects_manager_get_instance ();
-#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = effect_id;
-#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = transition_effects_manager_create_transition_clock (_tmp1_, _tmp2_);
-#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp3_;
-#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp1_);
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->transition_clock;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 13111 "Page.c"
+#line 12793 "Page.c"
 		TransitionEffectsManager* _tmp5_ = NULL;
 		TransitionEffectsManager* _tmp6_ = NULL;
 		TransitionClock* _tmp7_ = NULL;
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = transition_effects_manager_get_instance ();
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = transition_effects_manager_create_null_transition_clock (_tmp6_);
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_clock_unref0 (self->priv->transition_clock);
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->transition_clock = _tmp7_;
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_effects_manager_unref0 (_tmp6_);
-#line 13127 "Page.c"
+#line 12809 "Page.c"
 	}
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = duration_msec;
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = _tmp8_;
-#line 13133 "Page.c"
+#line 12815 "Page.c"
 }
 
 
@@ -13161,86 +12843,86 @@ static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, Zo
 	gint _tmp49_ = 0;
 	gint _tmp50_ = 0;
 	cairo_t* _tmp51_ = NULL;
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp1_);
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
 	view_rect = _tmp1_;
-#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = single_photo_page_get_zoom_buffer (self);
-#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != NULL;
-#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 13187 "Page.c"
+#line 12869 "Page.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 		GdkPixbuf* _tmp15_ = NULL;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->zoom_high_quality;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp6_) {
-#line 13195 "Page.c"
+#line 12877 "Page.c"
 			ZoomBuffer* _tmp7_ = NULL;
 			ZoomBuffer* _tmp8_ = NULL;
 			ZoomState _tmp9_ = {0};
 			GdkPixbuf* _tmp10_ = NULL;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = single_photo_page_get_zoom_buffer (self);
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = _tmp7_;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = *zoom_state;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = zoom_buffer_get_zoomed_image (_tmp8_, &_tmp9_);
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp10_;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp8_);
-#line 13214 "Page.c"
+#line 12896 "Page.c"
 		} else {
 			ZoomBuffer* _tmp11_ = NULL;
 			ZoomBuffer* _tmp12_ = NULL;
 			ZoomState _tmp13_ = {0};
 			GdkPixbuf* _tmp14_ = NULL;
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = single_photo_page_get_zoom_buffer (self);
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _tmp11_;
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = *zoom_state;
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = zoom_buffer_get_zoom_preview_image (_tmp12_, &_tmp13_);
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp14_;
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp12_);
-#line 13234 "Page.c"
+#line 12916 "Page.c"
 		}
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _g_object_ref0 (_tmp5_);
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp15_;
-#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 13244 "Page.c"
+#line 12926 "Page.c"
 	} else {
 		GdkRectangle view_rect_proj = {0};
 		GdkPixbuf* _tmp16_ = NULL;
@@ -13262,113 +12944,113 @@ static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, Zo
 		GdkRectangle _tmp31_ = {0};
 		gint _tmp32_ = 0;
 		GdkPixbuf* _tmp33_ = NULL;
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->unscaled;
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewing_rectangle_projection (zoom_state, _tmp16_, &_tmp17_);
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 		view_rect_proj = _tmp17_;
-#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = self->priv->unscaled;
-#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = view_rect_proj;
-#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_.x;
-#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = view_rect_proj;
-#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_.y;
-#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_rect_proj;
-#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_.width;
-#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = view_rect_proj;
-#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_.height;
-#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = gdk_pixbuf_new_subpixbuf (_tmp18_, _tmp20_, _tmp22_, _tmp24_, _tmp26_);
-#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		proj_subpixbuf = _tmp27_;
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = proj_subpixbuf;
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = view_rect;
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.width;
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = view_rect;
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_.height;
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = gdk_pixbuf_scale_simple (_tmp28_, _tmp30_, _tmp32_, GDK_INTERP_BILINEAR);
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp33_;
-#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (proj_subpixbuf);
-#line 13312 "Page.c"
+#line 12994 "Page.c"
 	}
-#line 2074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp34_ = zoomed;
-#line 2074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp34_ == NULL) {
-#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13322 "Page.c"
+#line 13004 "Page.c"
 	}
-#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = self->priv->pixmap_dim;
-#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_.width;
-#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = view_rect;
-#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = _tmp37_.width;
-#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = (_tmp36_ - _tmp38_) / 2;
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = draw_x;
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = CLAMP (_tmp39_, 0, G_MAXINT);
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = _tmp40_;
-#line 2081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = self->priv->pixmap_dim;
-#line 2081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = _tmp41_.height;
-#line 2081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp43_ = view_rect;
-#line 2081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = _tmp43_.height;
-#line 2081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = (_tmp42_ - _tmp44_) / 2;
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = draw_y;
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = CLAMP (_tmp45_, 0, G_MAXINT);
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = _tmp46_;
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = self->priv->pixmap_ctx;
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = zoomed;
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = draw_x;
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp50_ = draw_y;
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_cairo_set_source_pixbuf (_tmp47_, _tmp48_, (gdouble) _tmp49_, (gdouble) _tmp50_);
-#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp51_ = self->priv->pixmap_ctx;
-#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp51_);
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (zoomed);
-#line 13372 "Page.c"
+#line 13054 "Page.c"
 }
 
 
@@ -13380,39 +13062,39 @@ void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, ZoomState* in
 	gboolean _tmp3_ = FALSE;
 	ZoomState _tmp4_ = {0};
 	GtkDrawingArea* _tmp5_ = NULL;
-#line 2088 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2088 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = FALSE;
-#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13416 "Page.c"
+#line 13098 "Page.c"
 }
 
 
@@ -13424,230 +13106,230 @@ void single_photo_page_on_interactive_pan (SinglePhotoPage* self, ZoomState* int
 	gboolean _tmp3_ = FALSE;
 	ZoomState _tmp4_ = {0};
 	GtkDrawingArea* _tmp5_ = NULL;
-#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2105 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2105 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2106 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2106 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2111 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2113 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2113 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13460 "Page.c"
+#line 13142 "Page.c"
 }
 
 
 static gboolean single_photo_page_real_is_zoom_supported (SinglePhotoPage* self) {
 	gboolean result = FALSE;
-#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13470 "Page.c"
+#line 13152 "Page.c"
 }
 
 
 gboolean single_photo_page_is_zoom_supported (SinglePhotoPage* self) {
-#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->is_zoom_supported (self);
-#line 13479 "Page.c"
+#line 13161 "Page.c"
 }
 
 
 static void single_photo_page_real_cancel_zoom (SinglePhotoPage* self) {
 	cairo_surface_t* _tmp0_ = NULL;
-#line 2121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 13489 "Page.c"
+#line 13171 "Page.c"
 		cairo_t* _tmp1_ = NULL;
 		cairo_t* _tmp2_ = NULL;
-#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->pixmap_ctx;
-#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp1_, "#000");
-#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap_ctx;
-#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_paint (_tmp2_);
-#line 13500 "Page.c"
+#line 13182 "Page.c"
 	}
 }
 
 
 void single_photo_page_cancel_zoom (SinglePhotoPage* self) {
-#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->cancel_zoom (self);
-#line 13510 "Page.c"
+#line 13192 "Page.c"
 }
 
 
 static void single_photo_page_real_save_zoom_state (SinglePhotoPage* self) {
 	ZoomState _tmp0_ = {0};
-#line 2128 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->static_zoom_state;
-#line 2128 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->saved_zoom_state = _tmp0_;
-#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = TRUE;
-#line 13522 "Page.c"
+#line 13204 "Page.c"
 }
 
 
 void single_photo_page_save_zoom_state (SinglePhotoPage* self) {
-#line 2127 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2127 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->save_zoom_state (self);
-#line 13531 "Page.c"
+#line 13213 "Page.c"
 }
 
 
 static void single_photo_page_real_restore_zoom_state (SinglePhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->has_saved_zoom_state;
-#line 2133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13544 "Page.c"
+#line 13226 "Page.c"
 	}
-#line 2136 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->saved_zoom_state;
-#line 2136 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 2137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 13554 "Page.c"
+#line 13236 "Page.c"
 }
 
 
 void single_photo_page_restore_zoom_state (SinglePhotoPage* self) {
-#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->restore_zoom_state (self);
-#line 13563 "Page.c"
+#line 13245 "Page.c"
 }
 
 
 static ZoomBuffer* single_photo_page_real_get_zoom_buffer (SinglePhotoPage* self) {
 	ZoomBuffer* result = NULL;
-#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13573 "Page.c"
+#line 13255 "Page.c"
 }
 
 
 ZoomBuffer* single_photo_page_get_zoom_buffer (SinglePhotoPage* self) {
-#line 2141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->get_zoom_buffer (self);
-#line 13582 "Page.c"
+#line 13264 "Page.c"
 }
 
 
 void single_photo_page_get_saved_zoom_state (SinglePhotoPage* self, ZoomState* result) {
 	ZoomState _tmp0_ = {0};
-#line 2145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->saved_zoom_state;
-#line 2146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13596 "Page.c"
+#line 13278 "Page.c"
 }
 
 
 void single_photo_page_set_zoom_state (SinglePhotoPage* self, ZoomState* zoom_state) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = *zoom_state;
-#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 13615 "Page.c"
+#line 13297 "Page.c"
 }
 
 
 void single_photo_page_get_zoom_state (SinglePhotoPage* self, ZoomState* result) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->static_zoom_state;
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp1_;
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13634 "Page.c"
+#line 13316 "Page.c"
 }
 
 
 static void single_photo_page_real_switched_to (Page* base) {
 	SinglePhotoPage * self;
 	GdkPixbuf* _tmp0_ = NULL;
-#line 2161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (single_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint (self, NULL);
-#line 13651 "Page.c"
+#line 13333 "Page.c"
 	}
 }
 
@@ -13656,21 +13338,21 @@ static void single_photo_page_real_set_container (Page* base, GtkWindow* contain
 	SinglePhotoPage * self;
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
-#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = container;
-#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (single_photo_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_);
-#line 2173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = container;
-#line 2173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_scrolled_window_set_policy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 13674 "Page.c"
+#line 13356 "Page.c"
 	}
 }
 
@@ -13687,92 +13369,92 @@ void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, D
 	GdkPixbuf* _tmp8_ = NULL;
 	GtkDrawingArea* _tmp9_ = NULL;
 	Direction* _tmp10_ = NULL;
-#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (unscaled));
-#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (max_dim != NULL);
-#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *max_dim;
-#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_dim;
-#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp3_);
-#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_init (&self->priv->static_zoom_state, &_tmp0_, &_tmp1_, _tmp2_, &_tmp3_);
-#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = unscaled;
-#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = _tmp5_;
-#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = *max_dim;
-#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->max_dim = _tmp6_;
-#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->scaled;
-#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = _tmp8_;
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->canvas;
-#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = direction;
-#line 2196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, _tmp10_);
-#line 13741 "Page.c"
+#line 13423 "Page.c"
 }
 
 
 void single_photo_page_blank_display (SinglePhotoPage* self) {
 	GtkDrawingArea* _tmp0_ = NULL;
-#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 2202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 13769 "Page.c"
+#line 13451 "Page.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 13776 "Page.c"
+#line 13458 "Page.c"
 }
 
 
@@ -13780,38 +13462,38 @@ cairo_surface_t* single_photo_page_get_surface (SinglePhotoPage* self) {
 	cairo_surface_t* result = NULL;
 	cairo_surface_t* _tmp0_ = NULL;
 	cairo_surface_t* _tmp1_ = NULL;
-#line 2212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_surface_reference0 (_tmp0_);
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13794 "Page.c"
+#line 13476 "Page.c"
 }
 
 
 void single_photo_page_get_surface_dim (SinglePhotoPage* self, Dimensions* result) {
 	Dimensions _tmp0_ = {0};
-#line 2216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2178 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_dim;
-#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13808 "Page.c"
+#line 13490 "Page.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 13815 "Page.c"
+#line 13497 "Page.c"
 }
 
 
@@ -13819,17 +13501,17 @@ cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self) {
 	cairo_t* result = NULL;
 	cairo_t* _tmp0_ = NULL;
 	cairo_t* _tmp1_ = NULL;
-#line 2220 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_reference0 (_tmp0_);
-#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13833 "Page.c"
+#line 13515 "Page.c"
 }
 
 
@@ -13839,25 +13521,25 @@ void single_photo_page_paint_text (SinglePhotoPage* self, PangoLayout* pango_lay
 	gint _tmp2_ = 0;
 	cairo_t* _tmp3_ = NULL;
 	PangoLayout* _tmp4_ = NULL;
-#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (PANGO_IS_LAYOUT (pango_layout));
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->text_ctx;
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_move_to (_tmp0_, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->text_ctx;
-#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = pango_layout;
-#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
 	pango_cairo_show_layout (_tmp3_, _tmp4_);
-#line 13861 "Page.c"
+#line 13543 "Page.c"
 }
 
 
@@ -13866,55 +13548,55 @@ void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* resul
 	GtkWindow* _tmp1_ = NULL;
 	GtkWindow* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 2229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_FULLSCREEN_WINDOW);
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 13882 "Page.c"
+#line 13564 "Page.c"
 		GtkWindow* _tmp4_ = NULL;
 		GtkWindow* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 		Scaling _tmp7_ = {0};
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->scale_up_to_viewport;
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_screen (_tmp5_, _tmp6_, &_tmp7_);
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_;
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 13899 "Page.c"
+#line 13581 "Page.c"
 	} else {
 		GtkViewport* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		Scaling _tmp10_ = {0};
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->viewport;
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->scale_up_to_viewport;
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp9_, &_tmp10_);
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp10_;
-#line 13912 "Page.c"
+#line 13594 "Page.c"
 	}
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13918 "Page.c"
+#line 13600 "Page.c"
 }
 
 
@@ -13922,17 +13604,17 @@ GdkPixbuf* single_photo_page_get_unscaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 2234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13936 "Page.c"
+#line 13618 "Page.c"
 }
 
 
@@ -13940,31 +13622,31 @@ GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled;
-#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13954 "Page.c"
+#line 13636 "Page.c"
 }
 
 
 void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, GdkRectangle* result) {
 	GdkRectangle _tmp0_ = {0};
-#line 2243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled_pos;
-#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13968 "Page.c"
+#line 13650 "Page.c"
 }
 
 
@@ -13974,50 +13656,50 @@ gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, gint x, gint
 	gint _tmp1_ = 0;
 	GdkRectangle _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 2247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->scaled_pos;
-#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = coord_in_rectangle (_tmp0_, _tmp1_, &_tmp2_);
-#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13992 "Page.c"
+#line 13674 "Page.c"
 }
 
 
 void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) {
 	GtkDrawingArea* _tmp0_ = NULL;
 	GdkWindow* _tmp1_ = NULL;
-#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 14009 "Page.c"
+#line 13691 "Page.c"
 		GtkDrawingArea* _tmp2_ = NULL;
 		GdkWindow* _tmp3_ = NULL;
 		GdkRectangle _tmp4_ = {0};
-#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = *rect;
-#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, &_tmp4_, FALSE);
-#line 14021 "Page.c"
+#line 13703 "Page.c"
 	}
 }
 
@@ -14025,51 +13707,51 @@ void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) {
 void single_photo_page_invalidate_all (SinglePhotoPage* self) {
 	GtkDrawingArea* _tmp0_ = NULL;
 	GdkWindow* _tmp1_ = NULL;
-#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 14037 "Page.c"
+#line 13719 "Page.c"
 		GtkDrawingArea* _tmp2_ = NULL;
 		GdkWindow* _tmp3_ = NULL;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2220 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2220 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2220 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, NULL, FALSE);
-#line 14046 "Page.c"
+#line 13728 "Page.c"
 	}
 }
 
 
 static void single_photo_page_on_viewport_resize (SinglePhotoPage* self) {
-#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, TRUE, NULL);
-#line 14056 "Page.c"
+#line 13738 "Page.c"
 }
 
 
 static void single_photo_page_real_on_resize_finished (Page* base, GdkRectangle* rect) {
 	SinglePhotoPage * self;
 	GdkRectangle _tmp0_ = {0};
-#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *rect;
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (single_photo_page_parent_class)->on_resize_finished (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), &_tmp0_);
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 14073 "Page.c"
+#line 13755 "Page.c"
 }
 
 
@@ -14080,114 +13762,114 @@ static gboolean single_photo_page_on_canvas_exposed (SinglePhotoPage* self, cair
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	cairo_t* _tmp7_ = NULL;
-#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (exposed_ctx != NULL, FALSE);
-#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 14092 "Page.c"
+#line 13774 "Page.c"
 		cairo_t* _tmp1_ = NULL;
 		cairo_surface_t* _tmp2_ = NULL;
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = exposed_ctx;
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap;
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_set_source_surface (_tmp1_, _tmp2_, (gdouble) 0, (gdouble) 0);
-#line 14101 "Page.c"
+#line 13783 "Page.c"
 	} else {
 		cairo_t* _tmp3_ = NULL;
-#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = exposed_ctx;
-#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 14108 "Page.c"
+#line 13790 "Page.c"
 	}
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = exposed_ctx;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gtk_widget_get_allocated_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gtk_widget_get_allocated_height (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_);
-#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = exposed_ctx;
-#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp7_);
-#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2246 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2246 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 14126 "Page.c"
+#line 13808 "Page.c"
 }
 
 
 static void single_photo_page_real_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 14135 "Page.c"
+#line 13817 "Page.c"
 }
 
 
 void single_photo_page_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->new_surface (self, ctx, ctx_dim);
-#line 14144 "Page.c"
+#line 13826 "Page.c"
 }
 
 
 static void single_photo_page_real_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 14153 "Page.c"
+#line 13835 "Page.c"
 }
 
 
 void single_photo_page_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->updated_pixbuf (self, pixbuf, reason, old_dim);
-#line 14162 "Page.c"
+#line 13844 "Page.c"
 }
 
 
 static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = single_photo_page_is_zoom_supported (self);
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 14177 "Page.c"
+#line 13859 "Page.c"
 		gboolean _tmp2_ = FALSE;
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = zoom_state_is_default (&self->priv->static_zoom_state);
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 14183 "Page.c"
+#line 13865 "Page.c"
 	} else {
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 14187 "Page.c"
+#line 13869 "Page.c"
 	}
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 14191 "Page.c"
+#line 13873 "Page.c"
 		cairo_t* _tmp3_ = NULL;
 		cairo_t* _tmp4_ = NULL;
 		Dimensions _tmp5_ = {0};
@@ -14196,31 +13878,31 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 		gint _tmp8_ = 0;
 		cairo_t* _tmp9_ = NULL;
 		ZoomState _tmp10_ = {0};
-#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = ctx;
-#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = ctx;
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->pixmap_dim;
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_.width;
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->pixmap_dim;
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_.height;
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp6_, (gdouble) _tmp8_);
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = ctx;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_fill (_tmp9_);
-#line 2299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->static_zoom_state;
-#line 2299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_render_zoomed_to_pixmap (self, &_tmp10_);
-#line 14224 "Page.c"
+#line 13906 "Page.c"
 	} else {
 		TransitionClock* _tmp11_ = NULL;
 		cairo_t* _tmp12_ = NULL;
@@ -14229,23 +13911,23 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 		Dimensions _tmp15_ = {0};
 		gint _tmp16_ = 0;
 		gboolean _tmp17_ = FALSE;
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->transition_clock;
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = ctx;
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = *ctx_dim;
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp13_.width;
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = *ctx_dim;
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_.height;
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = transition_clock_paint (_tmp11_, _tmp12_, _tmp14_, _tmp16_);
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp17_) {
-#line 14249 "Page.c"
+#line 13931 "Page.c"
 			cairo_t* _tmp18_ = NULL;
 			cairo_t* _tmp19_ = NULL;
 			Dimensions _tmp20_ = {0};
@@ -14260,56 +13942,56 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 			GdkRectangle _tmp29_ = {0};
 			gint _tmp30_ = 0;
 			cairo_t* _tmp31_ = NULL;
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = ctx;
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
 			set_source_color_from_string (_tmp18_, "#000");
-#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = ctx;
-#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = self->priv->pixmap_dim;
-#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_.width;
-#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = self->priv->pixmap_dim;
-#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_.height;
-#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_rectangle (_tmp19_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp21_, (gdouble) _tmp23_);
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = ctx;
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_fill (_tmp24_);
-#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = ctx;
-#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = self->priv->scaled;
-#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = self->priv->scaled_pos;
-#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_.x;
-#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = self->priv->scaled_pos;
-#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _tmp29_.y;
-#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
 			gdk_cairo_set_source_pixbuf (_tmp25_, _tmp26_, (gdouble) _tmp28_, (gdouble) _tmp30_);
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = ctx;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_paint (_tmp31_);
-#line 14302 "Page.c"
+#line 13984 "Page.c"
 		}
 	}
 }
 
 
 void single_photo_page_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->paint (self, ctx, ctx_dim);
-#line 14313 "Page.c"
+#line 13995 "Page.c"
 }
 
 
@@ -14317,44 +13999,44 @@ static void single_photo_page_repaint_pixmap (SinglePhotoPage* self) {
 	cairo_t* _tmp0_ = NULL;
 	cairo_t* _tmp1_ = NULL;
 	Dimensions _tmp2_ = {0};
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2313 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2313 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14329 "Page.c"
+#line 14011 "Page.c"
 	}
-#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_dim;
-#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_paint (self, _tmp1_, &_tmp2_);
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 14339 "Page.c"
+#line 14021 "Page.c"
 }
 
 
 void single_photo_page_repaint (SinglePhotoPage* self, Direction* direction) {
 	Direction* _tmp0_ = NULL;
-#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = direction;
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, FALSE, _tmp0_);
-#line 14351 "Page.c"
+#line 14033 "Page.c"
 }
 
 
 static void _single_photo_page_repaint_pixmap_transition_clock_repaint_callback (gpointer self) {
-#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint_pixmap ((SinglePhotoPage*) self);
-#line 14358 "Page.c"
+#line 14040 "Page.c"
 }
 
 
@@ -14397,171 +14079,171 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 	Direction* _tmp84_ = NULL;
 	TransitionClock* _tmp98_ = NULL;
 	gboolean _tmp99_ = FALSE;
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2289 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2289 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = NULL;
-#line 2330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14417 "Page.c"
+#line 14099 "Page.c"
 	}
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->unscaled;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = TRUE;
-#line 14425 "Page.c"
+#line 14107 "Page.c"
 	} else {
 		GtkDrawingArea* _tmp3_ = NULL;
 		GdkWindow* _tmp4_ = NULL;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->canvas;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp4_ == NULL;
-#line 14435 "Page.c"
+#line 14117 "Page.c"
 	}
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14441 "Page.c"
+#line 14123 "Page.c"
 	}
-#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), &_tmp6_);
-#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 	allocation = _tmp6_;
-#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = allocation;
-#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_.width;
-#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
 	width = _tmp8_;
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = allocation;
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_.height;
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
 	height = _tmp10_;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = width;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ <= 0) {
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = TRUE;
-#line 14467 "Page.c"
+#line 14149 "Page.c"
 	} else {
 		gint _tmp13_ = 0;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = height;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp13_ <= 0;
-#line 14474 "Page.c"
+#line 14156 "Page.c"
 	}
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_) {
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14480 "Page.c"
+#line 14162 "Page.c"
 	}
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->scaled;
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixbuf = _tmp14_ == NULL;
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->scaled_pos;
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_for_rectangle (&_tmp15_, &_tmp16_);
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_dim = _tmp16_;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->scaled_pos;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_pos = _tmp17_;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->pixmap_dim;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_.width;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = width;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != _tmp21_) {
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = TRUE;
-#line 14506 "Page.c"
+#line 14188 "Page.c"
 	} else {
 		Dimensions _tmp22_ = {0};
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->pixmap_dim;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _tmp22_.height;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = height;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp23_ != _tmp24_;
-#line 14519 "Page.c"
+#line 14201 "Page.c"
 	}
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 14527 "Page.c"
+#line 14209 "Page.c"
 	}
-#line 2357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixmap = FALSE;
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->pixmap;
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp25_ == NULL) {
-#line 14535 "Page.c"
+#line 14217 "Page.c"
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
-#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = width;
-#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = height;
-#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_init_pixmap (self, _tmp26_, _tmp27_);
-#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Page.vala"
 		new_pixmap = TRUE;
-#line 14546 "Page.c"
+#line 14228 "Page.c"
 	}
-#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = new_pixbuf;
-#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
-#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = TRUE;
-#line 14554 "Page.c"
+#line 14236 "Page.c"
 	} else {
 		gboolean _tmp30_ = FALSE;
-#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = new_pixmap;
-#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = _tmp30_;
-#line 14561 "Page.c"
+#line 14243 "Page.c"
 	}
-#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp28_) {
-#line 14565 "Page.c"
+#line 14247 "Page.c"
 		Dimensions unscaled_dim = {0};
 		GdkPixbuf* _tmp31_ = NULL;
 		Dimensions _tmp32_ = {0};
@@ -14586,155 +14268,155 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		gint _tmp60_ = 0;
 		Dimensions _tmp61_ = {0};
 		gint _tmp62_ = 0;
-#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->unscaled;
-#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_pixbuf (_tmp31_, &_tmp32_);
-#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
 		unscaled_dim = _tmp32_;
-#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2330 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_init (&scaled_dim, 0, 0);
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp36_ = self->priv->scale_up_to_viewport;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp36_) {
-#line 14602 "Page.c"
+#line 14284 "Page.c"
 			gboolean _tmp37_ = FALSE;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = dimensions_has_area (&self->priv->max_dim);
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = _tmp37_;
-#line 14608 "Page.c"
+#line 14290 "Page.c"
 		} else {
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = FALSE;
-#line 14612 "Page.c"
+#line 14294 "Page.c"
 		}
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp35_) {
-#line 14616 "Page.c"
+#line 14298 "Page.c"
 			Dimensions _tmp38_ = {0};
 			gint _tmp39_ = 0;
 			gint _tmp40_ = 0;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = self->priv->max_dim;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_.width;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp40_ = width;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = _tmp39_ < _tmp40_;
-#line 14628 "Page.c"
+#line 14310 "Page.c"
 		} else {
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = FALSE;
-#line 14632 "Page.c"
+#line 14314 "Page.c"
 		}
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp34_) {
-#line 14636 "Page.c"
+#line 14318 "Page.c"
 			Dimensions _tmp41_ = {0};
 			gint _tmp42_ = 0;
 			gint _tmp43_ = 0;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->max_dim;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = _tmp41_.height;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = height;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = _tmp42_ < _tmp43_;
-#line 14648 "Page.c"
+#line 14330 "Page.c"
 		} else {
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = FALSE;
-#line 14652 "Page.c"
+#line 14334 "Page.c"
 		}
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp33_) {
-#line 14656 "Page.c"
+#line 14338 "Page.c"
 			Dimensions _tmp44_ = {0};
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2332 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp44_ = self->priv->max_dim;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2332 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp44_;
-#line 14662 "Page.c"
+#line 14344 "Page.c"
 		} else {
 			Dimensions _tmp45_ = {0};
 			Dimensions _tmp46_ = {0};
-#line 2372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = self->priv->pixmap_dim;
-#line 2372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 			dimensions_get_scaled_proportional (&unscaled_dim, &_tmp45_, &_tmp46_);
-#line 2372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp46_;
-#line 14672 "Page.c"
+#line 14354 "Page.c"
 		}
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2336 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = width;
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2336 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = scaled_dim;
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2336 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.width;
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2336 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp47_ >= _tmp49_, "width >= scaled_dim.width");
-#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = height;
-#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = scaled_dim;
-#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = _tmp51_.height;
-#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp50_ >= _tmp52_, "height >= scaled_dim.height");
-#line 2378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp53_ = width;
-#line 2378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp54_ = scaled_dim;
-#line 2378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp55_ = _tmp54_.width;
-#line 2378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.x = (_tmp53_ - _tmp55_) / 2;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp56_ = height;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp57_ = scaled_dim;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp58_ = _tmp57_.height;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.y = (_tmp56_ - _tmp58_) / 2;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp59_ = scaled_dim;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp60_ = _tmp59_.width;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.width = _tmp60_;
-#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp61_ = scaled_dim;
-#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp62_ = _tmp61_.height;
-#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.height = _tmp62_;
-#line 14718 "Page.c"
+#line 14400 "Page.c"
 	}
-#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp64_ = fast;
-#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp64_) {
-#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_FAST_INTERP;
-#line 14726 "Page.c"
+#line 14408 "Page.c"
 	} else {
-#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14730 "Page.c"
+#line 14412 "Page.c"
 	}
-#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
 	interp = _tmp63_;
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp65_ = self->priv->scaled;
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp65_ == NULL) {
-#line 14738 "Page.c"
+#line 14420 "Page.c"
 		GdkPixbuf* _tmp66_ = NULL;
 		GdkRectangle _tmp67_ = {0};
 		Dimensions _tmp68_ = {0};
@@ -14749,101 +14431,101 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		GdkPixbuf* _tmp79_ = NULL;
 		SinglePhotoPageUpdateReason _tmp80_ = 0;
 		Dimensions _tmp81_ = {0};
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp66_ = self->priv->unscaled;
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp67_ = self->priv->scaled_pos;
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_rectangle (&_tmp67_, &_tmp68_);
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp69_ = interp;
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp70_ = resize_pixbuf (_tmp66_, &_tmp68_, _tmp69_);
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = _tmp70_;
-#line 2390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
 		reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_RESIZED_CANVAS;
-#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp71_ = new_pixbuf;
-#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp71_) {
-#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 			reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_NEW_PIXBUF;
-#line 14775 "Page.c"
+#line 14457 "Page.c"
 		} else {
 			gboolean _tmp72_ = FALSE;
 			gboolean _tmp73_ = FALSE;
-#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp73_ = new_pixmap;
-#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp73_) {
-#line 14783 "Page.c"
+#line 14465 "Page.c"
 				GdkInterpType _tmp74_ = 0;
-#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp74_ = interp;
-#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = _tmp74_ == SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14789 "Page.c"
+#line 14471 "Page.c"
 			} else {
-#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = FALSE;
-#line 14793 "Page.c"
+#line 14475 "Page.c"
 			}
-#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp72_) {
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Page.vala"
 				reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 14799 "Page.c"
+#line 14481 "Page.c"
 			}
 		}
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp75_ = self->priv->max_dim;
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp76_ = self->priv->pixmap_dim;
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp77_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp78_);
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_init (&self->priv->static_zoom_state, &_tmp75_, &_tmp76_, _tmp77_, &_tmp78_);
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp79_ = self->priv->scaled;
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = reason;
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = old_scaled_dim;
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_updated_pixbuf (self, _tmp79_, _tmp80_, &_tmp81_);
-#line 14820 "Page.c"
+#line 14502 "Page.c"
 	}
-#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp82_ = fast;
-#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = !_tmp82_;
-#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp84_ = direction;
-#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp84_ != NULL) {
-#line 14830 "Page.c"
+#line 14512 "Page.c"
 		TransitionClock* _tmp85_ = NULL;
 		gboolean _tmp86_ = FALSE;
-#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp85_ = self->priv->transition_clock;
-#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp86_ = transition_clock_is_in_progress (_tmp85_);
-#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = !_tmp86_;
-#line 14839 "Page.c"
+#line 14521 "Page.c"
 	} else {
-#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = FALSE;
-#line 14843 "Page.c"
+#line 14525 "Page.c"
 	}
-#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp83_) {
-#line 14847 "Page.c"
+#line 14529 "Page.c"
 		SpitTransitionsVisuals* visuals = NULL;
 		GdkPixbuf* _tmp87_ = NULL;
 		GdkRectangle _tmp88_ = {0};
@@ -14856,45 +14538,45 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		Direction* _tmp95_ = NULL;
 		SpitTransitionsDirection _tmp96_ = 0;
 		gint _tmp97_ = 0;
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp87_ = self->priv->old_scaled;
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp88_ = old_scaled_pos;
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp89_ = self->priv->scaled;
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp90_ = self->priv->scaled_pos;
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		parse_color ("#000", &_tmp91_);
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp92_ = spit_transitions_visuals_new (_tmp87_, &_tmp88_, _tmp89_, &_tmp90_, &_tmp91_);
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		visuals = _tmp92_;
-#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp93_ = self->priv->transition_clock;
-#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp94_ = visuals;
-#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp95_ = direction;
-#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp96_ = direction_to_transition_direction (*_tmp95_);
-#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp97_ = self->priv->transition_duration_msec;
-#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 		transition_clock_start (_tmp93_, _tmp94_, _tmp96_, _tmp97_, _single_photo_page_repaint_pixmap_transition_clock_repaint_callback, self);
-#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (visuals);
-#line 14888 "Page.c"
+#line 14570 "Page.c"
 	}
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp98_ = self->priv->transition_clock;
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp99_ = transition_clock_is_in_progress (_tmp98_);
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp99_) {
-#line 2414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint_pixmap (self);
-#line 14898 "Page.c"
+#line 14580 "Page.c"
 	}
 }
 
@@ -14915,65 +14597,65 @@ static void single_photo_page_init_pixmap (SinglePhotoPage* self, gint width, gi
 	cairo_t* _tmp12_ = NULL;
 	cairo_t* _tmp13_ = NULL;
 	Dimensions _tmp14_ = {0};
-#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_ != NULL, "unscaled != null");
-#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->canvas;
-#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp2_ != NULL, "canvas.get_window() != null");
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = width;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = height;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp3_, _tmp4_);
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = _tmp5_;
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = width;
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = height;
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, _tmp6_, _tmp7_);
-#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->pixmap;
-#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = cairo_create (_tmp8_);
-#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = _tmp9_;
-#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->pixmap;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = cairo_create (_tmp10_);
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = _tmp11_;
-#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2395 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->text_ctx;
-#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2395 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp12_, "#fff");
-#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->pixmap_ctx;
-#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->pixmap_dim;
-#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_new_surface (self, _tmp13_, &_tmp14_);
-#line 14977 "Page.c"
+#line 14659 "Page.c"
 }
 
 
@@ -14984,23 +14666,23 @@ static gboolean single_photo_page_real_on_context_keypress (Page* base) {
 	GtkMenu* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 2441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 15004 "Page.c"
+#line 14686 "Page.c"
 }
 
 
@@ -15009,11 +14691,11 @@ static void single_photo_page_real_on_previous_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_previous_photo (SinglePhotoPage* self) {
-#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_previous_photo (self);
-#line 15017 "Page.c"
+#line 14699 "Page.c"
 }
 
 
@@ -15022,11 +14704,11 @@ static void single_photo_page_real_on_next_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_next_photo (SinglePhotoPage* self) {
-#line 2448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_next_photo (self);
-#line 15030 "Page.c"
+#line 14712 "Page.c"
 }
 
 
@@ -15043,266 +14725,266 @@ static gboolean single_photo_page_real_key_press_event (GtkWidget* base, GdkEven
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	GQuark _tmp8_ = 0U;
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label0 = 0;
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label1 = 0;
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label2 = 0;
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label3 = 0;
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label4 = 0;
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label5 = 0;
-#line 15059 "Page.c"
+#line 14741 "Page.c"
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-#line 2451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->time;
-#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->last_nav_key;
-#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
 	nav_ok = (_tmp1_ - _tmp2_) > ((guint32) SINGLE_PHOTO_PAGE_KEY_REPEAT_INTERVAL_MSEC);
-#line 2457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_->keyval;
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gdk_keyval_name (_tmp4_);
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_);
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((_tmp8_ == ((0 != _tmp7_label0) ? _tmp7_label0 : (_tmp7_label0 = g_quark_from_static_string ("Left")))) || (_tmp8_ == ((0 != _tmp7_label1) ? _tmp7_label1 : (_tmp7_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp8_ == ((0 != _tmp7_label2) ? _tmp7_label2 : (_tmp7_label2 = g_quark_from_static_string ("BackSpace"))))) {
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 15090 "Page.c"
+#line 14772 "Page.c"
 			default:
 			{
 				gboolean _tmp9_ = FALSE;
-#line 2462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = nav_ok;
-#line 2462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp9_) {
-#line 15098 "Page.c"
+#line 14780 "Page.c"
 					GdkEventKey* _tmp10_ = NULL;
 					guint32 _tmp11_ = 0U;
-#line 2463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_previous_photo (self);
-#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = event;
-#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp11_ = _tmp10_->time;
-#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp11_;
-#line 15109 "Page.c"
+#line 14791 "Page.c"
 				}
-#line 2466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2428 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 15113 "Page.c"
+#line 14795 "Page.c"
 			}
 		}
 	} else if (((_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Right")))) || (_tmp8_ == ((0 != _tmp7_label4) ? _tmp7_label4 : (_tmp7_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp8_ == ((0 != _tmp7_label5) ? _tmp7_label5 : (_tmp7_label5 = g_quark_from_static_string ("space"))))) {
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 15119 "Page.c"
+#line 14801 "Page.c"
 			default:
 			{
 				gboolean _tmp12_ = FALSE;
-#line 2471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = nav_ok;
-#line 2471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp12_) {
-#line 15127 "Page.c"
+#line 14809 "Page.c"
 					GdkEventKey* _tmp13_ = NULL;
 					guint32 _tmp14_ = 0U;
-#line 2472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_next_photo (self);
-#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = event;
-#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = _tmp13_->time;
-#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp14_;
-#line 15138 "Page.c"
+#line 14820 "Page.c"
 				}
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 15142 "Page.c"
+#line 14824 "Page.c"
 			}
 		}
 	} else {
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 15148 "Page.c"
+#line 14830 "Page.c"
 			default:
 			{
-#line 2478 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2440 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 2479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2441 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 15155 "Page.c"
+#line 14837 "Page.c"
 			}
 		}
 	}
-#line 2482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = handled;
-#line 2482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_) {
-#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 15167 "Page.c"
+#line 14849 "Page.c"
 	}
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (single_photo_page_parent_class)->key_press_event != NULL) {
-#line 15171 "Page.c"
+#line 14853 "Page.c"
 		GdkEventKey* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = GTK_WIDGET_CLASS (single_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), gtk_widget_get_type (), GtkWidget), _tmp17_);
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp18_;
-#line 15180 "Page.c"
+#line 14862 "Page.c"
 	} else {
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = TRUE;
-#line 15184 "Page.c"
+#line 14866 "Page.c"
 	}
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp16_;
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 15190 "Page.c"
+#line 14872 "Page.c"
 }
 
 
 static void single_photo_page_class_init (SinglePhotoPageClass * klass) {
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (SinglePhotoPagePrivate));
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->is_zoom_supported = single_photo_page_real_is_zoom_supported;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->cancel_zoom = single_photo_page_real_cancel_zoom;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->save_zoom_state = single_photo_page_real_save_zoom_state;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->restore_zoom_state = single_photo_page_real_restore_zoom_state;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->get_zoom_buffer = single_photo_page_real_get_zoom_buffer;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = single_photo_page_real_switched_to;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_container = single_photo_page_real_set_container;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_resize_finished = single_photo_page_real_on_resize_finished;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->new_surface = single_photo_page_real_new_surface;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->updated_pixbuf = single_photo_page_real_updated_pixbuf;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->paint = single_photo_page_real_paint;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = single_photo_page_real_on_context_keypress;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->on_previous_photo = single_photo_page_real_on_previous_photo;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->on_next_photo = single_photo_page_real_on_next_photo;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->key_press_event = single_photo_page_real_key_press_event;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = single_photo_page_finalize;
-#line 15231 "Page.c"
+#line 14913 "Page.c"
 }
 
 
 static void single_photo_page_instance_init (SinglePhotoPage * self) {
 	GtkDrawingArea* _tmp0_ = NULL;
 	GtkViewport* _tmp1_ = NULL;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = SINGLE_PHOTO_PAGE_GET_PRIVATE (self);
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkDrawingArea*) gtk_drawing_area_new ();
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
 	self->canvas = _tmp0_;
-#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	self->viewport = _tmp1_;
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1952 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = 0;
-#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = NULL;
-#line 1993 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = NULL;
-#line 1994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, 0, 0);
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 1997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = NULL;
-#line 1999 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&self->priv->scaled_pos, 0, sizeof (GdkRectangle));
-#line 2001 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 2004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_nav_key = (guint32) 0;
-#line 15278 "Page.c"
+#line 14960 "Page.c"
 }
 
 
 static void single_photo_page_finalize (GObject* obj) {
 	SinglePhotoPage * self;
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->canvas);
-#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->viewport);
-#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 1993 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 1997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (single_photo_page_parent_class)->finalize (obj);
-#line 15306 "Page.c"
+#line 14988 "Page.c"
 }
 
 
@@ -15319,32 +15001,32 @@ GType single_photo_page_get_type (void) {
 
 
 static void _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_begin ((DragAndDropHandler*) self, context);
-#line 15325 "Page.c"
+#line 15007 "Page.c"
 }
 
 
 static void _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get (GtkWidget* _sender, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time_, gpointer self) {
-#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_data_get ((DragAndDropHandler*) self, context, selection_data, info, time_);
-#line 15332 "Page.c"
+#line 15014 "Page.c"
 }
 
 
 static void _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_end ((DragAndDropHandler*) self);
-#line 15339 "Page.c"
+#line 15021 "Page.c"
 }
 
 
 static gboolean _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender, GdkDragContext* context, GtkDragResult _result_, gpointer self) {
 	gboolean result;
 	result = drag_and_drop_handler_on_drag_failed ((DragAndDropHandler*) self, context, _result_);
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2509 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 15348 "Page.c"
+#line 15030 "Page.c"
 }
 
 
@@ -15362,20 +15044,20 @@ static GType drag_and_drop_handler_target_type_get_type (void) {
 
 static GdkAtom* _gdk_atom_dup (GdkAtom* self) {
 	GdkAtom* dup;
-#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (GdkAtom, 1);
-#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (GdkAtom));
-#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 15372 "Page.c"
+#line 15054 "Page.c"
 }
 
 
 static gpointer __gdk_atom_dup0 (gpointer self) {
-#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? _gdk_atom_dup (self) : NULL;
-#line 15379 "Page.c"
+#line 15061 "Page.c"
 }
 
 
@@ -15396,117 +15078,117 @@ DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, Page* pa
 	GtkWidget* _tmp17_ = NULL;
 	GtkWidget* _tmp18_ = NULL;
 	GtkWidget* _tmp19_ = NULL;
-#line 2514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (page), NULL);
-#line 2514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (DragAndDropHandler*) g_type_create_instance (object_type);
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2477 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2477 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = _tmp0_;
-#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page;
-#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_event_source (_tmp1_);
-#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = _tmp2_;
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->event_source;
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_ != NULL, "event_source != null");
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2480 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->event_source;
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2480 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gtk_widget_get_has_window (_tmp4_);
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2480 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp5_, "event_source.get_has_window()");
-#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = drag_and_drop_handler_XDS_ATOM;
-#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 15430 "Page.c"
+#line 15112 "Page.c"
 		GdkAtom _tmp7_ = 0U;
 		GdkAtom* _tmp8_ = NULL;
-#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_atom_intern_static_string ("XdndDirectSave0");
-#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = __gdk_atom_dup0 (&_tmp7_);
-#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_XDS_ATOM);
-#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_ATOM = _tmp8_;
-#line 15441 "Page.c"
+#line 15123 "Page.c"
 	}
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp9_ == NULL) {
-#line 15447 "Page.c"
+#line 15129 "Page.c"
 		GdkAtom _tmp10_ = 0U;
 		GdkAtom* _tmp11_ = NULL;
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2487 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gdk_atom_intern_static_string ("text/plain");
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2487 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = __gdk_atom_dup0 (&_tmp10_);
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2487 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_TEXT_ATOM);
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2487 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_TEXT_ATOM = _tmp11_;
-#line 15458 "Page.c"
+#line 15140 "Page.c"
 	}
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2489 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2489 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2489 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ == NULL) {
-#line 15466 "Page.c"
+#line 15148 "Page.c"
 		gint _tmp13_ = 0;
 		guchar* _tmp14_ = NULL;
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = string_to_uchar_array ("shotwell.txt", &_tmp13_);
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET = (g_free (drag_and_drop_handler_XDS_FAKE_TARGET), NULL);
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET = _tmp14_;
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET_length1 = _tmp13_;
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		_drag_and_drop_handler_XDS_FAKE_TARGET_size_ = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 15479 "Page.c"
+#line 15161 "Page.c"
 	}
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->event_source;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_set (_tmp15_, GDK_BUTTON1_MASK, DRAG_AND_DROP_HANDLER_SOURCE_TARGET_ENTRIES, G_N_ELEMENTS (DRAG_AND_DROP_HANDLER_SOURCE_TARGET_ENTRIES), GDK_ACTION_COPY);
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->event_source;
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect (_tmp16_, "drag-begin", (GCallback) _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin, self);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->event_source;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect (_tmp17_, "drag-data-get", (GCallback) _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get, self);
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2500 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->event_source;
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2500 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect (_tmp18_, "drag-end", (GCallback) _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end, self);
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->event_source;
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect (_tmp19_, "drag-failed", (GCallback) _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed, self);
-#line 2514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 15503 "Page.c"
+#line 15185 "Page.c"
 }
 
 
 DragAndDropHandler* drag_and_drop_handler_new (Page* page) {
-#line 2514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
 	return drag_and_drop_handler_construct (TYPE_DRAG_AND_DROP_HANDLER, page);
-#line 15510 "Page.c"
+#line 15192 "Page.c"
 }
 
 
@@ -15532,116 +15214,116 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 	guint8* _tmp31_ = NULL;
 	gint _tmp31__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 2554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2555: on_drag_begin (%s)", _tmp2_);
-#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2517: on_drag_begin (%s)", _tmp2_);
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->page;
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_ == NULL) {
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 15556 "Page.c"
+#line 15238 "Page.c"
 	} else {
 		Page* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->page;
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (_tmp6_);
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_count (_tmp8_);
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp9_ == 0;
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 15574 "Page.c"
+#line 15256 "Page.c"
 	}
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15580 "Page.c"
+#line 15262 "Page.c"
 	} else {
 		ExporterUI* _tmp10_ = NULL;
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->exporter;
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp10_ != NULL;
-#line 15587 "Page.c"
+#line 15269 "Page.c"
 	}
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15593 "Page.c"
+#line 15275 "Page.c"
 	}
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->page;
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = page_get_view (_tmp11_);
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_;
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = view_collection_get_selected_at (_tmp13_, 0);
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = data_view_get_source (_tmp15_);
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource);
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp15_);
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp13_);
-#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	thumb = _tmp17_;
-#line 15619 "Page.c"
+#line 15301 "Page.c"
 	{
 		GdkPixbuf* icon = NULL;
 		ThumbnailSource* _tmp18_ = NULL;
 		GdkPixbuf* _tmp19_ = NULL;
 		GtkWidget* _tmp20_ = NULL;
 		GdkPixbuf* _tmp21_ = NULL;
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = thumb;
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = thumbnail_source_get_thumbnail (_tmp18_, APP_WINDOW_DND_ICON_SCALE, &_inner_error_);
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 		icon = _tmp19_;
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15634 "Page.c"
+#line 15316 "Page.c"
 			goto __catch252_g_error;
 		}
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->event_source;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = icon;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_drag_source_set_icon_pixbuf (_tmp20_, _tmp21_);
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (icon);
-#line 15645 "Page.c"
+#line 15327 "Page.c"
 	}
 	goto __finally252;
 	__catch252_g_error:
@@ -15652,58 +15334,58 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 		gchar* _tmp24_ = NULL;
 		GError* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 		_inner_error_ = NULL;
-#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = thumb;
-#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
-#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_;
-#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = err;
-#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_->message;
-#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:2569: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
-#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+		g_warning ("Page.vala:2531: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp24_);
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_error_free0 (err);
-#line 15676 "Page.c"
+#line 15358 "Page.c"
 	}
 	__finally252:
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (thumb);
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 		g_clear_error (&_inner_error_);
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15689 "Page.c"
+#line 15371 "Page.c"
 	}
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = context;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = gdk_drag_context_get_source_window (_tmp27_);
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = drag_and_drop_handler_XDS_ATOM;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_property_change (_tmp28_, *_tmp29_, *_tmp30_, 8, GDK_PROP_MODE_REPLACE, (const guchar*) _tmp31_, 1);
-#line 2554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (thumb);
-#line 15707 "Page.c"
+#line 15389 "Page.c"
 }
 
 
@@ -15714,61 +15396,61 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 	gboolean _tmp3_ = FALSE;
 	Page* _tmp4_ = NULL;
 	guint _tmp9_ = 0U;
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2585: on_drag_data_get (%s)", _tmp2_);
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2547: on_drag_data_get (%s)", _tmp2_);
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15740 "Page.c"
+#line 15422 "Page.c"
 	} else {
 		Page* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->page;
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_view (_tmp5_);
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = view_collection_get_selected_count (_tmp7_);
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp8_ == 0;
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 15758 "Page.c"
+#line 15440 "Page.c"
 	}
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15764 "Page.c"
+#line 15446 "Page.c"
 	}
-#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2552 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = target_type;
-#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2552 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp9_) {
-#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2552 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_XDS:
-#line 15772 "Page.c"
+#line 15454 "Page.c"
 		{
 			guchar* data = NULL;
 			guchar* _tmp10_ = NULL;
@@ -15804,83 +15486,83 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			guchar* _tmp45_ = NULL;
 			guchar* _tmp46_ = NULL;
 			gint _tmp46__length1 = 0;
-#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = g_new0 (guchar, 4096);
-#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp10_;
-#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = 4096;
-#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2595 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = 0;
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = context;
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = gdk_drag_context_get_source_window (_tmp11_);
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = drag_and_drop_handler_XDS_ATOM;
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = data;
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15__length1 = data_length1;
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = gdk_property_get (_tmp12_, *_tmp13_, *_tmp14_, (gulong) 0, (gulong) _tmp15__length1, 0, &_tmp16_, &_tmp17_, &_tmp19_, &_tmp18_);
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_type = _tmp16_;
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = _tmp17_;
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp18_;
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = _tmp19_;
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 			fetched = _tmp20_;
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = fetched;
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp23_) {
-#line 15850 "Page.c"
+#line 15532 "Page.c"
 				guchar* _tmp24_ = NULL;
 				gint _tmp24__length1 = 0;
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = data;
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24__length1 = data_length1;
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = _tmp24_ != NULL;
-#line 15859 "Page.c"
+#line 15541 "Page.c"
 			} else {
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = FALSE;
-#line 15863 "Page.c"
+#line 15545 "Page.c"
 			}
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp22_) {
-#line 15867 "Page.c"
+#line 15549 "Page.c"
 				guchar* _tmp25_ = NULL;
 				gint _tmp25__length1 = 0;
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = data;
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25__length1 = data_length1;
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = _tmp25__length1 > 0;
-#line 15876 "Page.c"
+#line 15558 "Page.c"
 			} else {
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = FALSE;
-#line 15880 "Page.c"
+#line 15562 "Page.c"
 			}
-#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 15884 "Page.c"
+#line 15566 "Page.c"
 				guchar* _tmp26_ = NULL;
 				gint _tmp26__length1 = 0;
 				gchar* _tmp27_ = NULL;
@@ -15888,103 +15570,103 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 				GFile* _tmp29_ = NULL;
 				GFile* _tmp30_ = NULL;
 				GFile* _tmp31_ = NULL;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = data;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26__length1 = data_length1;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = uchar_array_to_string (_tmp26_, _tmp26__length1, -1);
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = _tmp27_;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = g_file_new_for_uri (_tmp28_);
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = _tmp29_;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = g_file_get_parent (_tmp30_);
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->drag_destination);
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->drag_destination = _tmp31_;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp30_);
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp28_);
-#line 15914 "Page.c"
+#line 15596 "Page.c"
 			}
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = self->priv->drag_destination;
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp33_ != NULL) {
-#line 15920 "Page.c"
+#line 15602 "Page.c"
 				GFile* _tmp34_ = NULL;
 				gchar* _tmp35_ = NULL;
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = self->priv->drag_destination;
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = g_file_get_path (_tmp34_);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp35_;
-#line 15931 "Page.c"
+#line 15613 "Page.c"
 			} else {
 				gchar* _tmp36_ = NULL;
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = g_strdup ("(no path)");
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp36_;
-#line 15940 "Page.c"
+#line 15622 "Page.c"
 			}
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = self->priv->page;
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = page_get_page_name (_tmp37_);
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_;
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
-			g_debug ("Page.vala:2604: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+			g_debug ("Page.vala:2566: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp39_);
-#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->drag_destination;
-#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ != NULL) {
-#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "S";
-#line 15958 "Page.c"
+#line 15640 "Page.c"
 			} else {
-#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "E";
-#line 15962 "Page.c"
+#line 15644 "Page.c"
 			}
-#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = selection_data;
-#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = drag_and_drop_handler_XDS_ATOM;
-#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = string_to_uchar_array (_tmp40_, &_tmp44_);
-#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = _tmp45_;
-#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46__length1 = _tmp44_;
-#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp42_, *_tmp43_, 8, _tmp46_, _tmp44_);
-#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = (g_free (_tmp46_), NULL);
-#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2572 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp32_);
-#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2572 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2572 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15984 "Page.c"
+#line 15666 "Page.c"
 		}
-#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2552 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_MEDIA_LIST:
-#line 15988 "Page.c"
+#line 15670 "Page.c"
 		{
 			GeeCollection* sources = NULL;
 			Page* _tmp47_ = NULL;
@@ -15999,41 +15681,41 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			guchar* _tmp56_ = NULL;
 			guchar* _tmp57_ = NULL;
 			gint _tmp57__length1 = 0;
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp47_ = self->priv->page;
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp48_ = page_get_view (_tmp47_);
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp49_ = _tmp48_;
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp50_ = view_collection_get_selected_sources (_tmp49_);
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp51_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp49_);
-#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 			sources = _tmp51_;
-#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp52_ = selection_data;
-#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp53_ = gdk_atom_intern_static_string ("SourceIDAtom");
-#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp54_ = sources;
-#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp56_ = serialize_media_sources (_tmp54_, &_tmp55_);
-#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = _tmp56_;
-#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57__length1 = _tmp55_;
-#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp52_, _tmp53_, (gint) sizeof (GdkAtom), _tmp57_, _tmp55_);
-#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = (g_free (_tmp57_), NULL);
-#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (sources);
-#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 16037 "Page.c"
+#line 15719 "Page.c"
 		}
 		default:
 		{
@@ -16041,30 +15723,30 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			gchar* _tmp59_ = NULL;
 			gchar* _tmp60_ = NULL;
 			guint _tmp61_ = 0U;
-#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp58_ = self->priv->page;
-#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp59_ = page_get_page_name (_tmp58_);
-#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp60_ = _tmp59_;
-#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp61_ = target_type;
-#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
-			g_warning ("Page.vala:2623: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
-#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+			g_warning ("Page.vala:2585: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp60_);
-#line 2625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 16059 "Page.c"
+#line 15741 "Page.c"
 		}
 	}
 }
 
 
 static void _drag_and_drop_handler_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
-#line 2646 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_export_completed ((DragAndDropHandler*) self);
-#line 16068 "Page.c"
+#line 15750 "Page.c"
 }
 
 
@@ -16083,99 +15765,99 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) {
 	gchar* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
 	gboolean _tmp19_ = FALSE;
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2630 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2630: on_drag_end (%s)", _tmp2_);
-#line 2630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2592: on_drag_end (%s)", _tmp2_);
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->page;
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = TRUE;
-#line 16105 "Page.c"
+#line 15787 "Page.c"
 	} else {
 		Page* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->page;
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = view_collection_get_selected_count (_tmp9_);
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp10_ == 0;
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 16123 "Page.c"
+#line 15805 "Page.c"
 	}
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 16129 "Page.c"
+#line 15811 "Page.c"
 	} else {
 		GFile* _tmp11_ = NULL;
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->drag_destination;
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp11_ == NULL;
-#line 16136 "Page.c"
+#line 15818 "Page.c"
 	}
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 16142 "Page.c"
+#line 15824 "Page.c"
 	} else {
 		ExporterUI* _tmp12_ = NULL;
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2595 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->exporter;
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2595 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp12_ != NULL;
-#line 16149 "Page.c"
+#line 15831 "Page.c"
 	}
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 16155 "Page.c"
+#line 15837 "Page.c"
 	}
-#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->drag_destination;
-#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = g_file_get_path (_tmp13_);
-#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2637: Exporting to %s", _tmp15_);
-#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2599: Exporting to %s", _tmp15_);
+#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp15_);
-#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->drag_destination;
-#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = g_file_get_path (_tmp16_);
-#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = _tmp18_ != NULL;
-#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp18_);
-#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp19_) {
-#line 16179 "Page.c"
+#line 15861 "Page.c"
 		Page* _tmp20_ = NULL;
 		ViewCollection* _tmp21_ = NULL;
 		ViewCollection* _tmp22_ = NULL;
@@ -16188,56 +15870,56 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) {
 		Exporter* _tmp29_ = NULL;
 		ExporterUI* _tmp30_ = NULL;
 		ExporterUI* _tmp31_ = NULL;
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->page;
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = page_get_view (_tmp20_);
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_;
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_collection_get_selected_sources (_tmp22_);
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = self->priv->drag_destination;
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_original (&_tmp26_);
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		export_format_parameters_current (&_tmp27_);
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = exporter_new (_tmp24_, _tmp25_, &_tmp26_, &_tmp27_, FALSE);
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_;
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = exporter_ui_new (_tmp29_);
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		_exporter_ui_unref0 (self->priv->exporter);
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->exporter = _tmp30_;
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp29_);
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp24_);
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp22_);
-#line 2646 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->exporter;
-#line 2646 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
 		exporter_ui_export (_tmp31_, _drag_and_drop_handler_on_export_completed_exporter_completion_callback, self);
-#line 16228 "Page.c"
+#line 15910 "Page.c"
 	} else {
 		const gchar* _tmp32_ = NULL;
-#line 2648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _ ("Photos cannot be exported to this directory.");
-#line 2648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 		app_window_error_message (_tmp32_, NULL);
-#line 16235 "Page.c"
+#line 15917 "Page.c"
 	}
-#line 2651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 16241 "Page.c"
+#line 15923 "Page.c"
 }
 
 
@@ -16248,271 +15930,271 @@ static gboolean drag_and_drop_handler_on_drag_failed (DragAndDropHandler* self,
 	gchar* _tmp2_ = NULL;
 	GtkDragResult _tmp3_ = 0;
 	Page* _tmp4_ = NULL;
-#line 2654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_DRAG_AND_DROP_HANDLER (self), FALSE);
-#line 2654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = drag_result;
-#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2655: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
-#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2617: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 2658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 16276 "Page.c"
+#line 15958 "Page.c"
 	}
-#line 2660 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2660 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 16286 "Page.c"
+#line 15968 "Page.c"
 }
 
 
 static void drag_and_drop_handler_on_export_completed (DragAndDropHandler* self) {
-#line 2665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 2666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 16297 "Page.c"
+#line 15979 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_init (GValue* value) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	value->data[0].v_pointer = NULL;
-#line 16304 "Page.c"
+#line 15986 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_free_value (GValue* value) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	if (value->data[0].v_pointer) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (value->data[0].v_pointer);
-#line 16313 "Page.c"
+#line 15995 "Page.c"
 	}
 }
 
 
 static void value_drag_and_drop_handler_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = drag_and_drop_handler_ref (src_value->data[0].v_pointer);
-#line 16323 "Page.c"
+#line 16005 "Page.c"
 	} else {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 16327 "Page.c"
+#line 16009 "Page.c"
 	}
 }
 
 
 static gpointer value_drag_and_drop_handler_peek_pointer (const GValue* value) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 16335 "Page.c"
+#line 16017 "Page.c"
 }
 
 
 static gchar* value_drag_and_drop_handler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	if (collect_values[0].v_pointer) {
-#line 16342 "Page.c"
+#line 16024 "Page.c"
 		DragAndDropHandler* object;
 		object = collect_values[0].v_pointer;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16349 "Page.c"
+#line 16031 "Page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16353 "Page.c"
+#line 16035 "Page.c"
 		}
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = drag_and_drop_handler_ref (object);
-#line 16357 "Page.c"
+#line 16039 "Page.c"
 	} else {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16361 "Page.c"
+#line 16043 "Page.c"
 	}
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 16365 "Page.c"
+#line 16047 "Page.c"
 }
 
 
 static gchar* value_drag_and_drop_handler_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	DragAndDropHandler** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!object_p) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 16376 "Page.c"
+#line 16058 "Page.c"
 	}
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!value->data[0].v_pointer) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = NULL;
-#line 16382 "Page.c"
+#line 16064 "Page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 16386 "Page.c"
+#line 16068 "Page.c"
 	} else {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 16390 "Page.c"
+#line 16072 "Page.c"
 	}
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 16394 "Page.c"
+#line 16076 "Page.c"
 }
 
 
 GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecDragAndDropHandler* spec;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_DRAG_AND_DROP_HANDLER), NULL);
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	return G_PARAM_SPEC (spec);
-#line 16408 "Page.c"
+#line 16090 "Page.c"
 }
 
 
 gpointer value_get_drag_and_drop_handler (const GValue* value) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER), NULL);
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 16417 "Page.c"
+#line 16099 "Page.c"
 }
 
 
 void value_set_drag_and_drop_handler (GValue* value, gpointer v_object) {
 	DragAndDropHandler* old;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 16437 "Page.c"
+#line 16119 "Page.c"
 	} else {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16441 "Page.c"
+#line 16123 "Page.c"
 	}
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16447 "Page.c"
+#line 16129 "Page.c"
 	}
 }
 
 
 void value_take_drag_and_drop_handler (GValue* value, gpointer v_object) {
 	DragAndDropHandler* old;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 16466 "Page.c"
+#line 16148 "Page.c"
 	} else {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16470 "Page.c"
+#line 16152 "Page.c"
 	}
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16476 "Page.c"
+#line 16158 "Page.c"
 	}
 }
 
 
 static void drag_and_drop_handler_class_init (DragAndDropHandlerClass * klass) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_parent_class = g_type_class_peek_parent (klass);
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	((DragAndDropHandlerClass *) klass)->finalize = drag_and_drop_handler_finalize;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (DragAndDropHandlerPrivate));
-#line 16488 "Page.c"
+#line 16170 "Page.c"
 }
 
 
 static void drag_and_drop_handler_instance_init (DragAndDropHandler * self) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = DRAG_AND_DROP_HANDLER_GET_PRIVATE (self);
-#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	self->ref_count = 1;
-#line 16501 "Page.c"
+#line 16183 "Page.c"
 }
 
 
 static void drag_and_drop_handler_finalize (DragAndDropHandler* obj) {
 	DragAndDropHandler * self;
 	GtkWidget* _tmp0_ = NULL;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DRAG_AND_DROP_HANDLER, DragAndDropHandler);
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_destroy (self);
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 16516 "Page.c"
+#line 16198 "Page.c"
 		GtkWidget* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 		GtkWidget* _tmp3_ = NULL;
@@ -16521,45 +16203,45 @@ static void drag_and_drop_handler_finalize (DragAndDropHandler* obj) {
 		guint _tmp6_ = 0U;
 		GtkWidget* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-begin", gtk_widget_get_type (), &_tmp2_, NULL, FALSE);
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin, self);
-#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-data-get", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get, self);
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-end", gtk_widget_get_type (), &_tmp6_, NULL, FALSE);
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end, self);
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2509 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->event_source;
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2509 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp8_, NULL, FALSE);
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2509 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed, self);
-#line 16549 "Page.c"
+#line 16231 "Page.c"
 	}
-#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = NULL;
-#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = NULL;
-#line 2510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 16563 "Page.c"
+#line 16245 "Page.c"
 }
 
 
@@ -16580,24 +16262,24 @@ GType drag_and_drop_handler_get_type (void) {
 gpointer drag_and_drop_handler_ref (gpointer instance) {
 	DragAndDropHandler* self;
 	self = instance;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	return instance;
-#line 16588 "Page.c"
+#line 16270 "Page.c"
 }
 
 
 void drag_and_drop_handler_unref (gpointer instance) {
 	DragAndDropHandler* self;
 	self = instance;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		DRAG_AND_DROP_HANDLER_GET_CLASS (self)->finalize (self);
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 16601 "Page.c"
+#line 16283 "Page.c"
 	}
 }
 
diff --git a/src/Page.vala b/src/Page.vala
index 13caae6..a65a1e2 100644
--- a/src/Page.vala
+++ b/src/Page.vala
@@ -40,8 +40,7 @@ public class InjectionGroup {
         return elements;
     }
 
-    public void add_menu_item(string name, string? action = null, string?
-            accellerator = null) {
+    public void add_menu_item(string name, string? action = null, string? accellerator = null) {
         elements.add(new Element(name, action, accellerator, Element.ItemType.MENUITEM));
     }
 
@@ -208,6 +207,9 @@ public abstract class Page : Gtk.ScrolledWindow {
     private bool menubar_injected = false;
     public GLib.MenuModel get_menubar() {
         var model = builder.get_object ("MenuBar") as GLib.Menu;
+        if (model == null) {
+            return new GLib.Menu();
+        }
 
         if (!menubar_injected) {
             // Collect injected UI elements and add them to the UI manager
@@ -1148,48 +1150,8 @@ public abstract class Page : Gtk.ScrolledWindow {
     }
 
     protected void update_menu_item_label (string id,
-                                           string new_label) {
-        var bar = this.builder.get_object ("MenuBar") as GLib.Menu;
-
-        if (bar == null) {
-            return;
-        }
-
-        var items = bar.get_n_items ();
-        for (var i = 0; i< items; i++) {
-            var model = bar.get_item_link (i, GLib.Menu.LINK_SUBMENU);
-            if (bar == null) {
-                continue;
-            }
-
-            var model_items = model.get_n_items ();
-            for (var j = 0; j < model_items; j++) {
-                var subsection = model.get_item_link (j, GLib.Menu.LINK_SECTION);
-
-                if (subsection == null)
-                    continue;
-
-                // Recurse into submenus
-                var sub_items = subsection.get_n_items ();
-                for (var k = 0; k < sub_items; k++) {
-                    var it = subsection.iterate_item_attributes (k);
-                    while (it.next ()) {
-                        if (it.get_name () == "id") {
-                            if (it.get_value ().get_string () == id) {
-                                var md = subsection as GLib.Menu;
-                                var m = new GLib.MenuItem.from_model
-                                    (subsection, k);
-                                m.set_label (new_label);
-                                md.remove (k);
-                                md.insert_item (k, m);
-
-                                return;
-                            }
-                        }
-                    }
-                }
-            }
-        }
+                                         string new_label) {
+        AppWindow.get_instance().update_menu_item_label (id, new_label);
     }
 
     protected GLib.MenuModel? find_extension_point (GLib.MenuModel model,
diff --git a/src/Photo.c b/src/Photo.c
index 19c1911..776a63d 100644
--- a/src/Photo.c
+++ b/src/Photo.c
@@ -1,4 +1,4 @@
-/* Photo.c generated by valac 0.34.2, the Vala compiler
+/* Photo.c generated by valac 0.32.1, the Vala compiler
  * generated from Photo.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -15171,7 +15171,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 #line 15170 "Photo.c"
 	}
 #line 1945 "/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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 #line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = _tmp1_;
 #line 15176 "Photo.c"
@@ -34211,7 +34211,7 @@ static void photo_class_init (PhotoClass * klass) {
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (klass)->finalize = photo_finalize;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_signal_new ("editable_replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ());
+	g_signal_new ("editable_replaced", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, editable_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_FILE, G_TYPE_FILE);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_new ("raw_development_modified", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, raw_development_modified), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36919,37 +36919,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 36930 "Photo.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 36938 "Photo.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 36950 "Photo.c"
 	}
@@ -36969,112 +36969,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 36974 "Photo.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 36980 "Photo.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 36984 "Photo.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 36988 "Photo.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 37000 "Photo.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 37010 "Photo.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 37016 "Photo.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 37030 "Photo.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 37040 "Photo.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 37046 "Photo.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 37055 "Photo.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 37075 "Photo.c"
 }
@@ -38400,11 +38400,11 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol
 #line 4461 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->_transaction_controller = NULL;
 #line 4462 "/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_TYPE_FILE, (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);
 #line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->by_editable_file = _tmp0_;
 #line 4464 "/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_TYPE_FILE, (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);
 #line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->by_raw_development_file = _tmp1_;
 #line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -42137,19 +42137,19 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH
 #line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE (self);
 #line 5384 "/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_TYPE_FILE, (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);
 #line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->editable_file_map = _tmp0_;
 #line 5386 "/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_TYPE_FILE, (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);
 #line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->development_file_map = _tmp1_;
 #line 5388 "/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, g_object_unref, G_TYPE_FILE, (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);
 #line 5388 "/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 5390 "/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, g_object_unref, G_TYPE_FILE, (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);
 #line 5390 "/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 42151 "Photo.c"
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c
index a307aae..a6f5f2e 100644
--- a/src/PhotoMonitor.c
+++ b/src/PhotoMonitor.c
@@ -1,4 +1,4 @@
-/* PhotoMonitor.c generated by valac 0.34.2, the Vala compiler
+/* PhotoMonitor.c generated by valac 0.32.1, the Vala compiler
  * generated from PhotoMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
@@ -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, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
@@ -6616,7 +6616,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6617 "PhotoMonitor.c"
-					goto __catch582_database_error;
+					goto __catch580_database_error;
 				}
 #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_g_object_unref0 (reimport_raw_developments);
@@ -6641,8 +6641,8 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6640 "PhotoMonitor.c"
 			}
 		}
-		goto __finally582;
-		__catch582_database_error:
+		goto __finally580;
+		__catch580_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp97_ = NULL;
@@ -6658,7 +6658,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 			_g_error_free0 (err);
 #line 6658 "PhotoMonitor.c"
 		}
-		__finally582:
+		__finally580:
 #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6718,7 +6718,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6719 "PhotoMonitor.c"
-					goto __catch583_database_error;
+					goto __catch581_database_error;
 				}
 #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_g_object_unref0 (reimport_raw_developments);
@@ -6743,8 +6743,8 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6742 "PhotoMonitor.c"
 			}
 		}
-		goto __finally583;
-		__catch583_database_error:
+		goto __finally581;
+		__catch581_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp105_ = NULL;
@@ -6760,7 +6760,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 			_g_error_free0 (err);
 #line 6760 "PhotoMonitor.c"
 		}
-		__finally583:
+		__finally581:
 #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7437,7 +7437,7 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7437 "PhotoMonitor.c"
-				goto __catch584_database_error;
+				goto __catch582_database_error;
 			}
 #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_background_job_unref0 (job);
@@ -7450,8 +7450,8 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 #line 7448 "PhotoMonitor.c"
 		}
 	}
-	goto __finally584;
-	__catch584_database_error:
+	goto __finally582;
+	__catch582_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp26_ = NULL;
@@ -7467,7 +7467,7 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 		_g_error_free0 (err);
 #line 7466 "PhotoMonitor.c"
 	}
-	__finally584:
+	__finally582:
 #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7650,7 +7650,7 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7650 "PhotoMonitor.c"
-				goto __catch585_database_error;
+				goto __catch583_database_error;
 			}
 #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_background_job_unref0 (job);
@@ -7663,8 +7663,8 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 #line 7661 "PhotoMonitor.c"
 		}
 	}
-	goto __finally585;
-	__catch585_database_error:
+	goto __finally583;
+	__catch583_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_ = NULL;
@@ -7680,7 +7680,7 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 		_g_error_free0 (err);
 #line 7679 "PhotoMonitor.c"
 	}
-	__finally585:
+	__finally583:
 #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7844,7 +7844,7 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7844 "PhotoMonitor.c"
-				goto __catch586_database_error;
+				goto __catch584_database_error;
 			}
 #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_background_job_unref0 (job);
@@ -7857,8 +7857,8 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 #line 7855 "PhotoMonitor.c"
 		}
 	}
-	goto __finally586;
-	__catch586_database_error:
+	goto __finally584;
+	__catch584_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_ = NULL;
@@ -7874,7 +7874,7 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 		_g_error_free0 (err);
 #line 7873 "PhotoMonitor.c"
 	}
-	__finally586:
+	__finally584:
 #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8030,14 +8030,14 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base)
 #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8030 "PhotoMonitor.c"
-			goto __catch587_g_error;
+			goto __catch585_g_error;
 		}
 #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->mark_online = _tmp0_;
 #line 8035 "PhotoMonitor.c"
 	}
-	goto __finally587;
-	__catch587_g_error:
+	goto __finally585;
+	__catch585_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -8058,7 +8058,7 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base)
 		_g_error_free0 (err);
 #line 8057 "PhotoMonitor.c"
 	}
-	__finally587:
+	__finally585:
 #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8208,14 +8208,14 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas
 #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8208 "PhotoMonitor.c"
-			goto __catch588_g_error;
+			goto __catch586_g_error;
 		}
 #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8213 "PhotoMonitor.c"
 	}
-	goto __finally588;
-	__catch588_g_error:
+	goto __finally586;
+	__catch586_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -8236,7 +8236,7 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas
 		_g_error_free0 (err);
 #line 8235 "PhotoMonitor.c"
 	}
-	__finally588:
+	__finally586:
 #line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8386,14 +8386,14 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ
 #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8386 "PhotoMonitor.c"
-			goto __catch589_g_error;
+			goto __catch587_g_error;
 		}
 #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8391 "PhotoMonitor.c"
 	}
-	goto __finally589;
-	__catch589_g_error:
+	goto __finally587;
+	__catch587_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -8414,7 +8414,7 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ
 		_g_error_free0 (err);
 #line 8413 "PhotoMonitor.c"
 	}
-	__finally589:
+	__finally587:
 #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
diff --git a/src/PhotoPage.c b/src/PhotoPage.c
index 1fe61d0..62e90b8 100644
--- a/src/PhotoPage.c
+++ b/src/PhotoPage.c
@@ -1,4 +1,4 @@
-/* PhotoPage.c generated by valac 0.34.2, the Vala compiler
+/* PhotoPage.c generated by valac 0.32.1, the Vala compiler
  * generated from PhotoPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -602,16 +602,6 @@ typedef struct _DirectPhotoPageClass DirectPhotoPageClass;
 typedef struct _AdjustDateTimePhotoCommand AdjustDateTimePhotoCommand;
 typedef struct _AdjustDateTimePhotoCommandClass AdjustDateTimePhotoCommandClass;
 
-#define TYPE_SET_BACKGROUND_DIALOG (set_background_dialog_get_type ())
-#define SET_BACKGROUND_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog))
-#define SET_BACKGROUND_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialogClass))
-#define IS_SET_BACKGROUND_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SET_BACKGROUND_DIALOG))
-#define IS_SET_BACKGROUND_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SET_BACKGROUND_DIALOG))
-#define SET_BACKGROUND_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialogClass))
-
-typedef struct _SetBackgroundDialog SetBackgroundDialog;
-typedef struct _SetBackgroundDialogClass SetBackgroundDialogClass;
-
 #define TYPE_SET_BACKGROUND_PHOTO_DIALOG (set_background_photo_dialog_get_type ())
 #define SET_BACKGROUND_PHOTO_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog))
 #define SET_BACKGROUND_PHOTO_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogClass))
@@ -621,7 +611,6 @@ typedef struct _SetBackgroundDialogClass SetBackgroundDialogClass;
 
 typedef struct _SetBackgroundPhotoDialog SetBackgroundPhotoDialog;
 typedef struct _SetBackgroundPhotoDialogClass SetBackgroundPhotoDialogClass;
-#define _set_background_dialog_unref0(var) ((var == NULL) ? NULL : (var = (set_background_dialog_unref (var), NULL)))
 
 #define EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL (editing_tools_straighten_tool_get_type ())
 #define EDITING_TOOLS_STRAIGHTEN_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool))
@@ -2055,13 +2044,6 @@ GType adjust_date_time_photo_command_get_type (void) G_GNUC_CONST;
 AdjustDateTimePhotoCommand* adjust_date_time_photo_command_new (Dateable* dateable, gint64 time_shift, gboolean modify_original);
 AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType object_type, Dateable* dateable, gint64 time_shift, gboolean modify_original);
 void editing_host_page_on_set_background (EditingHostPage* self);
-gpointer set_background_dialog_ref (gpointer instance);
-void set_background_dialog_unref (gpointer instance);
-GParamSpec* param_spec_set_background_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_set_background_dialog (GValue* value, gpointer v_object);
-void value_take_set_background_dialog (GValue* value, gpointer v_object);
-gpointer value_get_set_background_dialog (const GValue* value);
-GType set_background_dialog_get_type (void) G_GNUC_CONST;
 GType set_background_photo_dialog_get_type (void) G_GNUC_CONST;
 SetBackgroundPhotoDialog* set_background_photo_dialog_new (void);
 SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type);
@@ -2252,9 +2234,9 @@ static void library_photo_page_real_add_actions (Page* base);
 void page_add_actions (Page* self);
 GAction* page_get_action (Page* self, const gchar* name);
 gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* self);
-static GVariant* _variant_new12 (gboolean value);
+static GVariant* _variant_new16 (gboolean value);
 RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
-static GVariant* _variant_new13 (const gchar* value);
+static GVariant* _variant_new17 (const gchar* value);
 static InjectionGroup** library_photo_page_real_init_collect_injection_groups (Page* base, int* result_length1);
 InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1);
 InjectionGroup* injection_group_new (const gchar* path);
@@ -2378,8 +2360,8 @@ SetRatingSingleCommand* set_rating_single_command_new (DataSource* source, Ratin
 SetRatingSingleCommand* set_rating_single_command_construct (GType object_type, DataSource* source, Rating rating);
 gboolean rating_can_increase (Rating self);
 gboolean rating_can_decrease (Rating self);
-static GVariant* _variant_new14 (const gchar* value);
-static GVariant* _variant_new15 (const gchar* value);
+static GVariant* _variant_new18 (const gchar* value);
+static GVariant* _variant_new19 (const gchar* value);
 gboolean alteration_has_subject (Alteration* self, const gchar* subject);
 GType tags_dialog_get_type (void) G_GNUC_CONST;
 GType add_tags_dialog_get_type (void) G_GNUC_CONST;
@@ -2432,7 +2414,7 @@ static GType zoom_buffer_object_state_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 86 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2436 "PhotoPage.c"
+#line 2418 "PhotoPage.c"
 }
 
 
@@ -2485,28 +2467,28 @@ ZoomBuffer* zoom_buffer_construct (GType object_type, SinglePhotoPage* parent_pa
 	self->priv->workers = _tmp6_;
 #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 2489 "PhotoPage.c"
+#line 2471 "PhotoPage.c"
 }
 
 
 ZoomBuffer* zoom_buffer_new (SinglePhotoPage* parent_page, Photo* backing_photo, GdkPixbuf* preview_image) {
 #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return zoom_buffer_construct (TYPE_ZOOM_BUFFER, parent_page, backing_photo, preview_image);
-#line 2496 "PhotoPage.c"
+#line 2478 "PhotoPage.c"
 }
 
 
 static gpointer _background_job_ref0 (gpointer self) {
 #line 93 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? background_job_ref (self) : NULL;
-#line 2503 "PhotoPage.c"
+#line 2485 "PhotoPage.c"
 }
 
 
 static void _zoom_buffer_on_iso_transformation_complete_completion_callback (BackgroundJob* job, gpointer self) {
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_buffer_on_iso_transformation_complete ((ZoomBuffer*) self, job);
-#line 2510 "PhotoPage.c"
+#line 2492 "PhotoPage.c"
 }
 
 
@@ -2560,7 +2542,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 		_background_job_unref0 (fetch_job);
 #line 96 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 2563 "PhotoPage.c"
+#line 2545 "PhotoPage.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = fetch_job;
@@ -2586,7 +2568,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 	_tmp12_ = _tmp11_;
 #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) {
-#line 2589 "PhotoPage.c"
+#line 2571 "PhotoPage.c"
 		GdkPixbuf* _tmp13_ = NULL;
 		GdkPixbuf* _tmp14_ = NULL;
 		gint _tmp15_ = 0;
@@ -2615,7 +2597,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 		_g_object_unref0 (self->priv->reduced_source_image);
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->reduced_source_image = _tmp20_;
-#line 2618 "PhotoPage.c"
+#line 2600 "PhotoPage.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED;
@@ -2623,13 +2605,13 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 	_tmp21_ = self->priv->is_interactive_redraw_in_progress;
 #line 106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp21_) {
-#line 2626 "PhotoPage.c"
+#line 2608 "PhotoPage.c"
 		SinglePhotoPage* _tmp22_ = NULL;
 #line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = self->priv->parent_page;
 #line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (_tmp22_, NULL);
-#line 2632 "PhotoPage.c"
+#line 2614 "PhotoPage.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = self->priv->iso_source_image;
@@ -2663,7 +2645,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 	_background_job_unref0 (transformation_job);
 #line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_background_job_unref0 (fetch_job);
-#line 2666 "PhotoPage.c"
+#line 2648 "PhotoPage.c"
 }
 
 
@@ -2704,7 +2686,7 @@ static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, Backgr
 		_background_job_unref0 (transform_job);
 #line 120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 2707 "PhotoPage.c"
+#line 2689 "PhotoPage.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = transform_job;
@@ -2730,7 +2712,7 @@ static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, Backgr
 	_tmp12_ = _tmp11_;
 #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) {
-#line 2733 "PhotoPage.c"
+#line 2715 "PhotoPage.c"
 		GdkPixbuf* _tmp13_ = NULL;
 		GdkPixbuf* _tmp14_ = NULL;
 		gint _tmp15_ = 0;
@@ -2759,13 +2741,13 @@ static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, Backgr
 		_g_object_unref0 (self->priv->reduced_transformed_image);
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->reduced_transformed_image = _tmp20_;
-#line 2762 "PhotoPage.c"
+#line 2744 "PhotoPage.c"
 	}
 #line 129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY;
 #line 115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_background_job_unref0 (transform_job);
-#line 2768 "PhotoPage.c"
+#line 2750 "PhotoPage.c"
 }
 
 
@@ -2801,7 +2783,7 @@ static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, Backgrou
 		_background_job_unref0 (transform_job);
 #line 137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 2804 "PhotoPage.c"
+#line 2786 "PhotoPage.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = transform_job;
@@ -2823,7 +2805,7 @@ static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, Backgrou
 	single_photo_page_repaint (_tmp7_, NULL);
 #line 132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_background_job_unref0 (transform_job);
-#line 2826 "PhotoPage.c"
+#line 2808 "PhotoPage.c"
 }
 
 
@@ -2896,21 +2878,21 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
 	_tmp6_ = reduced_pixbuf;
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ != NULL) {
-#line 2899 "PhotoPage.c"
+#line 2881 "PhotoPage.c"
 		gdouble _tmp7_ = 0.0;
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = zoom_state_get_zoom_factor (zoom_state);
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp7_ < 0.5;
-#line 2905 "PhotoPage.c"
+#line 2887 "PhotoPage.c"
 	} else {
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = FALSE;
-#line 2909 "PhotoPage.c"
+#line 2891 "PhotoPage.c"
 	}
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 2913 "PhotoPage.c"
+#line 2895 "PhotoPage.c"
 		GdkPixbuf* _tmp8_ = NULL;
 		GdkPixbuf* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
@@ -2941,7 +2923,7 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
 		_tmp13_ = view_rect_proj.height;
 #line 161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_rect_proj.height = _tmp13_ / 2;
-#line 2944 "PhotoPage.c"
+#line 2926 "PhotoPage.c"
 	}
 #line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = view_rect_proj;
@@ -3019,14 +3001,14 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
 	_g_object_unref0 (sample_source_pixbuf);
 #line 181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3022 "PhotoPage.c"
+#line 3004 "PhotoPage.c"
 }
 
 
 static void _zoom_buffer_on_demand_transform_complete_completion_callback (BackgroundJob* job, gpointer self) {
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_buffer_on_demand_transform_complete ((ZoomBuffer*) self, job);
-#line 3029 "PhotoPage.c"
+#line 3011 "PhotoPage.c"
 }
 
 
@@ -3045,7 +3027,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 	_tmp0_ = self->priv->demand_transform_cached_pixbuf;
 #line 185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 3048 "PhotoPage.c"
+#line 3030 "PhotoPage.c"
 		ZoomState _tmp1_ = {0};
 		gboolean _tmp2_ = FALSE;
 #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3054,7 +3036,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 		_tmp2_ = zoom_state_equals (zoom_state, &_tmp1_);
 #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp2_) {
-#line 3057 "PhotoPage.c"
+#line 3039 "PhotoPage.c"
 			GdkPixbuf* _tmp3_ = NULL;
 			GdkPixbuf* _tmp4_ = NULL;
 #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3065,7 +3047,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 			result = _tmp4_;
 #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3068 "PhotoPage.c"
+#line 3050 "PhotoPage.c"
 		} else {
 			gdouble _tmp5_ = 0.0;
 			gdouble _tmp6_ = 0.0;
@@ -3075,7 +3057,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 			_tmp6_ = zoom_state_get_zoom_factor (&self->priv->demand_transform_zoom_state);
 #line 191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp5_ == _tmp6_) {
-#line 3078 "PhotoPage.c"
+#line 3060 "PhotoPage.c"
 				GdkRectangle curr_rect = {0};
 				GdkRectangle _tmp7_ = {0};
 				GdkRectangle pre_rect = {0};
@@ -3395,7 +3377,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 				result = composited_result;
 #line 231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 3398 "PhotoPage.c"
+#line 3380 "PhotoPage.c"
 			}
 		}
 	}
@@ -3403,7 +3385,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 	_tmp97_ = self->priv->demand_transform_job;
 #line 242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp97_ != NULL) {
-#line 3406 "PhotoPage.c"
+#line 3388 "PhotoPage.c"
 		ZoomState _tmp98_ = {0};
 		gboolean _tmp99_ = FALSE;
 #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3412,7 +3394,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 		_tmp99_ = zoom_state_equals (zoom_state, &_tmp98_);
 #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp99_) {
-#line 3415 "PhotoPage.c"
+#line 3397 "PhotoPage.c"
 			ZoomState _tmp100_ = {0};
 			GdkPixbuf* _tmp101_ = NULL;
 #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3423,7 +3405,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 			result = _tmp101_;
 #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3426 "PhotoPage.c"
+#line 3408 "PhotoPage.c"
 		} else {
 			ZoomBufferTransformationJob* _tmp102_ = NULL;
 			GdkPixbuf* zoomed = NULL;
@@ -3503,14 +3485,14 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 			_g_object_unref0 (zoomed);
 #line 258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3506 "PhotoPage.c"
+#line 3488 "PhotoPage.c"
 		}
 	}
 #line 263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp119_ = self->priv->demand_transform_job;
 #line 263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp119_ == NULL) {
-#line 3513 "PhotoPage.c"
+#line 3495 "PhotoPage.c"
 		GdkPixbuf* zoomed = NULL;
 		ZoomState _tmp120_ = {0};
 		GdkPixbuf* _tmp121_ = NULL;
@@ -3580,7 +3562,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 		_g_object_unref0 (zoomed);
 #line 275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 3583 "PhotoPage.c"
+#line 3565 "PhotoPage.c"
 	}
 #line 283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_critical ("PhotoPage.vala:283: %s", "ZoomBuffer: get_zoomed_image( ): in SOURCE-NOT-TRANSFORMED but can't t" \
@@ -3593,14 +3575,14 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 	result = _tmp137_;
 #line 285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3595 "PhotoPage.c"
+#line 3577 "PhotoPage.c"
 }
 
 
 static void _zoom_buffer_on_iso_source_fetch_complete_completion_callback (BackgroundJob* job, gpointer self) {
 #line 290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_buffer_on_iso_source_fetch_complete ((ZoomBuffer*) self, job);
-#line 3602 "PhotoPage.c"
+#line 3584 "PhotoPage.c"
 }
 
 
@@ -3643,7 +3625,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
 	_tmp0_ = self->priv->object_state;
 #line 289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED) {
-#line 3645 "PhotoPage.c"
+#line 3627 "PhotoPage.c"
 		BackgroundJob* iso_source_fetch_job = NULL;
 		Photo* _tmp1_ = NULL;
 		ZoomBufferIsoSourceFetchJob* _tmp2_ = NULL;
@@ -3665,7 +3647,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
 		self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS;
 #line 289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_background_job_unref0 (iso_source_fetch_job);
-#line 3667 "PhotoPage.c"
+#line 3649 "PhotoPage.c"
 	}
 #line 296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp5_);
@@ -3733,7 +3715,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
 	_g_object_unref0 (proj_subpixbuf);
 #line 309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3735 "PhotoPage.c"
+#line 3717 "PhotoPage.c"
 }
 
 
@@ -3751,7 +3733,7 @@ Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) {
 	result = _tmp1_;
 #line 313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3753 "PhotoPage.c"
+#line 3735 "PhotoPage.c"
 }
 
 
@@ -3770,7 +3752,7 @@ void zoom_buffer_update_preview_image (ZoomBuffer* self, GdkPixbuf* preview_imag
 	_g_object_unref0 (self->priv->preview_image);
 #line 317 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->preview_image = _tmp1_;
-#line 3772 "PhotoPage.c"
+#line 3754 "PhotoPage.c"
 }
 
 
@@ -3786,7 +3768,7 @@ void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_s
 	_tmp0_ = initial_zoom_state;
 #line 324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 3788 "PhotoPage.c"
+#line 3770 "PhotoPage.c"
 		ZoomState* _tmp1_ = NULL;
 		ZoomState _tmp2_ = {0};
 		GdkPixbuf* _tmp3_ = NULL;
@@ -3801,7 +3783,7 @@ void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_s
 		_tmp4_ = _tmp3_;
 #line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 3803 "PhotoPage.c"
+#line 3785 "PhotoPage.c"
 	}
 }
 
@@ -3820,7 +3802,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 	_tmp0_ = zoom_state_get_interpolation_factor (zoom_state);
 #line 333 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == 0.0) {
-#line 3822 "PhotoPage.c"
+#line 3804 "PhotoPage.c"
 		ZoomState _tmp1_ = {0};
 		GdkPixbuf* _tmp2_ = NULL;
 #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3831,7 +3813,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 		result = _tmp2_;
 #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 3833 "PhotoPage.c"
+#line 3815 "PhotoPage.c"
 	}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->object_state;
@@ -3841,7 +3823,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 		case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED:
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS:
-#line 3843 "PhotoPage.c"
+#line 3825 "PhotoPage.c"
 		{
 			ZoomState _tmp4_ = {0};
 			GdkPixbuf* _tmp5_ = NULL;
@@ -3853,11 +3835,11 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 			result = _tmp5_;
 #line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3855 "PhotoPage.c"
+#line 3837 "PhotoPage.c"
 		}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED:
-#line 3859 "PhotoPage.c"
+#line 3841 "PhotoPage.c"
 		{
 			ZoomState _tmp6_ = {0};
 			GdkPixbuf* _tmp7_ = NULL;
@@ -3869,11 +3851,11 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 			result = _tmp7_;
 #line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3871 "PhotoPage.c"
+#line 3853 "PhotoPage.c"
 		}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY:
-#line 3875 "PhotoPage.c"
+#line 3857 "PhotoPage.c"
 		{
 			ZoomState _tmp8_ = {0};
 			GdkPixbuf* _tmp9_ = NULL;
@@ -3891,7 +3873,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 			result = _tmp11_;
 #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3893 "PhotoPage.c"
+#line 3875 "PhotoPage.c"
 		}
 		default:
 		{
@@ -3908,7 +3890,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 			result = _tmp13_;
 #line 353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3909 "PhotoPage.c"
+#line 3891 "PhotoPage.c"
 		}
 	}
 }
@@ -3932,7 +3914,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom
 	result = _tmp1_;
 #line 360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3933 "PhotoPage.c"
+#line 3915 "PhotoPage.c"
 }
 
 
@@ -3965,14 +3947,14 @@ static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_construct (
 	self->priv->to_fetch = _tmp3_;
 #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 3966 "PhotoPage.c"
+#line 3948 "PhotoPage.c"
 }
 
 
 static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_new (ZoomBuffer* owner, Photo* to_fetch, CompletionCallback completion_callback, void* completion_callback_target) {
 #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return zoom_buffer_iso_source_fetch_job_construct (ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, owner, to_fetch, completion_callback, completion_callback_target);
-#line 3973 "PhotoPage.c"
+#line 3955 "PhotoPage.c"
 }
 
 
@@ -3981,7 +3963,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 	GError * _inner_error_ = NULL;
 #line 27 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJob);
-#line 3982 "PhotoPage.c"
+#line 3964 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_ = NULL;
@@ -3998,7 +3980,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		_tmp0_ = _tmp3_;
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3999 "PhotoPage.c"
+#line 3981 "PhotoPage.c"
 			goto __catch240_g_error;
 		}
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4011,7 +3993,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		self->fetched = _tmp4_;
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 4012 "PhotoPage.c"
+#line 3994 "PhotoPage.c"
 	}
 	goto __finally240;
 	__catch240_g_error:
@@ -4026,7 +4008,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 "m backing photo");
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (fetch_error);
-#line 4026 "PhotoPage.c"
+#line 4008 "PhotoPage.c"
 	}
 	__finally240:
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4037,7 +4019,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		g_clear_error (&_inner_error_);
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 4037 "PhotoPage.c"
+#line 4019 "PhotoPage.c"
 	}
 }
 
@@ -4051,7 +4033,7 @@ static void zoom_buffer_iso_source_fetch_job_class_init (ZoomBufferIsoSourceFetc
 	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;
-#line 4051 "PhotoPage.c"
+#line 4033 "PhotoPage.c"
 }
 
 
@@ -4060,7 +4042,7 @@ static void zoom_buffer_iso_source_fetch_job_instance_init (ZoomBufferIsoSourceF
 	self->priv = ZOOM_BUFFER_ISO_SOURCE_FETCH_JOB_GET_PRIVATE (self);
 #line 18 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->fetched = NULL;
-#line 4060 "PhotoPage.c"
+#line 4042 "PhotoPage.c"
 }
 
 
@@ -4074,7 +4056,7 @@ static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob* obj) {
 	_g_object_unref0 (self->fetched);
 #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	BACKGROUND_JOB_CLASS (zoom_buffer_iso_source_fetch_job_parent_class)->finalize (obj);
-#line 4074 "PhotoPage.c"
+#line 4056 "PhotoPage.c"
 }
 
 
@@ -4093,7 +4075,7 @@ static GType zoom_buffer_iso_source_fetch_job_get_type (void) {
 static gpointer _pixel_transformer_ref0 (gpointer self) {
 #line 55 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? pixel_transformer_ref (self) : NULL;
-#line 4093 "PhotoPage.c"
+#line 4075 "PhotoPage.c"
 }
 
 
@@ -4163,14 +4145,14 @@ static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GT
 	self->transformed = _tmp10_;
 #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 4163 "PhotoPage.c"
+#line 4145 "PhotoPage.c"
 }
 
 
 static ZoomBufferTransformationJob* zoom_buffer_transformation_job_new (ZoomBuffer* owner, GdkPixbuf* to_transform, PixelTransformer* transformer, CompletionCallback completion_callback, void* completion_callback_target, GCancellable* cancellable) {
 #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return zoom_buffer_transformation_job_construct (ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, owner, to_transform, transformer, completion_callback, completion_callback_target, cancellable);
-#line 4170 "PhotoPage.c"
+#line 4152 "PhotoPage.c"
 }
 
 
@@ -4183,7 +4165,7 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) {
 	_tmp0_ = self->priv->transformer;
 #line 60 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 4183 "PhotoPage.c"
+#line 4165 "PhotoPage.c"
 		PixelTransformer* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
 		GdkPixbuf* _tmp3_ = NULL;
@@ -4198,7 +4180,7 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) {
 		_tmp4_ = self->priv->cancellable;
 #line 61 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixel_transformer_transform_to_other_pixbuf (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 4198 "PhotoPage.c"
+#line 4180 "PhotoPage.c"
 	}
 }
 
@@ -4212,7 +4194,7 @@ static void zoom_buffer_transformation_job_class_init (ZoomBufferTransformationJ
 	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;
-#line 4212 "PhotoPage.c"
+#line 4194 "PhotoPage.c"
 }
 
 
@@ -4221,7 +4203,7 @@ static void zoom_buffer_transformation_job_instance_init (ZoomBufferTransformati
 	self->priv = ZOOM_BUFFER_TRANSFORMATION_JOB_GET_PRIVATE (self);
 #line 47 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->transformed = NULL;
-#line 4221 "PhotoPage.c"
+#line 4203 "PhotoPage.c"
 }
 
 
@@ -4239,7 +4221,7 @@ static void zoom_buffer_transformation_job_finalize (BackgroundJob* obj) {
 	_g_object_unref0 (self->transformed);
 #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	BACKGROUND_JOB_CLASS (zoom_buffer_transformation_job_parent_class)->finalize (obj);
-#line 4239 "PhotoPage.c"
+#line 4221 "PhotoPage.c"
 }
 
 
@@ -4262,7 +4244,7 @@ static void zoom_buffer_class_init (ZoomBufferClass * klass) {
 	g_type_class_add_private (klass, sizeof (ZoomBufferPrivate));
 #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = zoom_buffer_finalize;
-#line 4262 "PhotoPage.c"
+#line 4244 "PhotoPage.c"
 }
 
 
@@ -4291,7 +4273,7 @@ static void zoom_buffer_instance_init (ZoomBuffer * self) {
 	self->priv->workers = NULL;
 #line 82 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->is_interactive_redraw_in_progress = FALSE;
-#line 4291 "PhotoPage.c"
+#line 4273 "PhotoPage.c"
 }
 
 
@@ -4321,7 +4303,7 @@ static void zoom_buffer_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->parent_page);
 #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (zoom_buffer_parent_class)->finalize (obj);
-#line 4321 "PhotoPage.c"
+#line 4303 "PhotoPage.c"
 }
 
 
@@ -4340,77 +4322,77 @@ GType zoom_buffer_get_type (void) {
 static void _editing_host_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_photos_altered ((EditingHostPage*) self, items);
-#line 4340 "PhotoPage.c"
+#line 4322 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
-#line 4347 "PhotoPage.c"
+#line 4329 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, gpointer self) {
 #line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
-#line 4354 "PhotoPage.c"
+#line 4336 "PhotoPage.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 420 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 4361 "PhotoPage.c"
+#line 4343 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) {
 #line 431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_viewport_resized ((EditingHostPage*) self);
-#line 4368 "PhotoPage.c"
+#line 4350 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 4375 "PhotoPage.c"
+#line 4357 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_crop_toggled ((EditingHostPage*) self);
-#line 4382 "PhotoPage.c"
+#line 4364 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_straighten_toggled ((EditingHostPage*) self);
-#line 4389 "PhotoPage.c"
+#line 4371 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_redeye_toggled ((EditingHostPage*) self);
-#line 4396 "PhotoPage.c"
+#line 4378 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_toggled ((EditingHostPage*) self);
-#line 4403 "PhotoPage.c"
+#line 4385 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 4410 "PhotoPage.c"
+#line 4392 "PhotoPage.c"
 }
 
 
@@ -4419,14 +4401,14 @@ static gboolean _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_e
 	result = editing_host_page_on_zoom_out_pressed ((EditingHostPage*) self, event);
 #line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4419 "PhotoPage.c"
+#line 4401 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_zoom_slider_value_changed ((EditingHostPage*) self);
-#line 4426 "PhotoPage.c"
+#line 4408 "PhotoPage.c"
 }
 
 
@@ -4435,7 +4417,7 @@ static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_p
 	result = editing_host_page_on_zoom_slider_drag_begin ((EditingHostPage*) self, event);
 #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4435 "PhotoPage.c"
+#line 4417 "PhotoPage.c"
 }
 
 
@@ -4444,7 +4426,7 @@ static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_rel
 	result = editing_host_page_on_zoom_slider_drag_end ((EditingHostPage*) self, event);
 #line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4444 "PhotoPage.c"
+#line 4426 "PhotoPage.c"
 }
 
 
@@ -4453,7 +4435,7 @@ static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press
 	result = editing_host_page_on_zoom_slider_key_press ((EditingHostPage*) self, event);
 #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4453 "PhotoPage.c"
+#line 4435 "PhotoPage.c"
 }
 
 
@@ -4462,21 +4444,21 @@ static gboolean _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_ev
 	result = editing_host_page_on_zoom_in_pressed ((EditingHostPage*) self, event);
 #line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4462 "PhotoPage.c"
+#line 4444 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 4469 "PhotoPage.c"
+#line 4451 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 4476 "PhotoPage.c"
+#line 4458 "PhotoPage.c"
 }
 
 
@@ -4987,7 +4969,7 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	_g_object_unref0 (toolbar);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 4987 "PhotoPage.c"
+#line 4969 "PhotoPage.c"
 }
 
 
@@ -5011,7 +4993,7 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 	_tmp3_ = self->priv->enable_interactive_zoom_refresh;
 #line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 5011 "PhotoPage.c"
+#line 4993 "PhotoPage.c"
 		ZoomState _tmp4_ = {0};
 		gboolean _tmp5_ = FALSE;
 #line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5022,13 +5004,13 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 		_tmp5_ = zoom_state_is_default (&new_zoom_state);
 #line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 5022 "PhotoPage.c"
+#line 5004 "PhotoPage.c"
 			ZoomState _tmp6_ = {0};
 #line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = new_zoom_state;
 #line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_);
-#line 5028 "PhotoPage.c"
+#line 5010 "PhotoPage.c"
 		}
 	} else {
 		gboolean _tmp7_ = FALSE;
@@ -5038,22 +5020,22 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 		if (_tmp7_) {
 #line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 5038 "PhotoPage.c"
+#line 5020 "PhotoPage.c"
 		} else {
 			ZoomState _tmp8_ = {0};
 #line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = new_zoom_state;
 #line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 5045 "PhotoPage.c"
+#line 5027 "PhotoPage.c"
 		}
 #line 568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 5049 "PhotoPage.c"
+#line 5031 "PhotoPage.c"
 	}
 #line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5053 "PhotoPage.c"
+#line 5035 "PhotoPage.c"
 }
 
 
@@ -5078,7 +5060,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
 	_g_object_unref0 (_tmp1_);
 #line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5078 "PhotoPage.c"
+#line 5060 "PhotoPage.c"
 		GtkWindow* _tmp3_ = NULL;
 		FullscreenWindow* _tmp4_ = NULL;
 #line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5089,13 +5071,13 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
 		fullscreen_window_disable_toolbar_dismissal (_tmp4_);
 #line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5089 "PhotoPage.c"
+#line 5071 "PhotoPage.c"
 	}
 #line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5095 "PhotoPage.c"
+#line 5077 "PhotoPage.c"
 }
 
 
@@ -5125,7 +5107,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 	_g_object_unref0 (_tmp1_);
 #line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5125 "PhotoPage.c"
+#line 5107 "PhotoPage.c"
 		GtkWindow* _tmp3_ = NULL;
 		FullscreenWindow* _tmp4_ = NULL;
 #line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5136,7 +5118,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 		fullscreen_window_update_toolbar_dismissal (_tmp4_);
 #line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5136 "PhotoPage.c"
+#line 5118 "PhotoPage.c"
 	}
 #line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
@@ -5156,7 +5138,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 	result = FALSE;
 #line 594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5156 "PhotoPage.c"
+#line 5138 "PhotoPage.c"
 }
 
 
@@ -5172,7 +5154,7 @@ static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, Gd
 	result = TRUE;
 #line 599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5172 "PhotoPage.c"
+#line 5154 "PhotoPage.c"
 }
 
 
@@ -5188,7 +5170,7 @@ static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, Gdk
 	result = TRUE;
 #line 604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5188 "PhotoPage.c"
+#line 5170 "PhotoPage.c"
 }
 
 
@@ -5300,7 +5282,7 @@ static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, Gd
 	*result = _result_;
 #line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5300 "PhotoPage.c"
+#line 5282 "PhotoPage.c"
 }
 
 
@@ -5362,7 +5344,7 @@ static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* s
 	*result = _tmp11_;
 #line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5362 "PhotoPage.c"
+#line 5344 "PhotoPage.c"
 }
 
 
@@ -5420,7 +5402,7 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self,
 	*result = _tmp12_;
 #line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5420 "PhotoPage.c"
+#line 5402 "PhotoPage.c"
 }
 
 
@@ -5436,7 +5418,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 	if (_tmp0_ < 0.03) {
 #line 645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		interp = 0.0;
-#line 5436 "PhotoPage.c"
+#line 5418 "PhotoPage.c"
 	} else {
 		gdouble _tmp1_ = 0.0;
 #line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5445,7 +5427,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 		if (_tmp1_ > 0.97) {
 #line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			interp = 1.0;
-#line 5445 "PhotoPage.c"
+#line 5427 "PhotoPage.c"
 		}
 	}
 #line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5454,7 +5436,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 	result = _tmp2_;
 #line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5454 "PhotoPage.c"
+#line 5436 "PhotoPage.c"
 }
 
 
@@ -5478,7 +5460,7 @@ static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* s
 	result = _tmp3_;
 #line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5478 "PhotoPage.c"
+#line 5460 "PhotoPage.c"
 }
 
 
@@ -5523,7 +5505,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 	if (_tmp0_) {
 #line 658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5523 "PhotoPage.c"
+#line 5505 "PhotoPage.c"
 	}
 #line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -5577,7 +5559,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
 #line 674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5577 "PhotoPage.c"
+#line 5559 "PhotoPage.c"
 	}
 #line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = iso_pixel_under_cursor;
@@ -5609,7 +5591,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
 #line 687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5609 "PhotoPage.c"
+#line 5591 "PhotoPage.c"
 }
 
 
@@ -5621,7 +5603,7 @@ void editing_host_page_snap_zoom_to_min (EditingHostPage* self) {
 	_tmp0_ = self->priv->zoom_slider;
 #line 691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0);
-#line 5621 "PhotoPage.c"
+#line 5603 "PhotoPage.c"
 }
 
 
@@ -5633,7 +5615,7 @@ void editing_host_page_snap_zoom_to_max (EditingHostPage* self) {
 	_tmp0_ = self->priv->zoom_slider;
 #line 695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 1.0);
-#line 5633 "PhotoPage.c"
+#line 5615 "PhotoPage.c"
 }
 
 
@@ -5654,7 +5636,7 @@ void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) {
 	_tmp2_ = zoom_state_get_interpolation_factor (&iso_state);
 #line 700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), _tmp2_);
-#line 5654 "PhotoPage.c"
+#line 5636 "PhotoPage.c"
 }
 
 
@@ -5697,7 +5679,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 	if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) {
 #line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5697 "PhotoPage.c"
+#line 5679 "PhotoPage.c"
 			default:
 			{
 #line 708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5706,13 +5688,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5706 "PhotoPage.c"
+#line 5688 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) {
 #line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5712 "PhotoPage.c"
+#line 5694 "PhotoPage.c"
 			default:
 			{
 #line 714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5721,13 +5703,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5721 "PhotoPage.c"
+#line 5703 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("KP_Divide")))) {
 #line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5727 "PhotoPage.c"
+#line 5709 "PhotoPage.c"
 			default:
 			{
 #line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5736,13 +5718,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5736 "PhotoPage.c"
+#line 5718 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_Multiply")))) {
 #line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5742 "PhotoPage.c"
+#line 5724 "PhotoPage.c"
 			default:
 			{
 #line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5751,7 +5733,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5751 "PhotoPage.c"
+#line 5733 "PhotoPage.c"
 			}
 		}
 	}
@@ -5759,7 +5741,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 	result = FALSE;
 #line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5759 "PhotoPage.c"
+#line 5741 "PhotoPage.c"
 }
 
 
@@ -5768,7 +5750,7 @@ gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, GdkE
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_zoom_slider_key_press (self, event);
-#line 5768 "PhotoPage.c"
+#line 5750 "PhotoPage.c"
 }
 
 
@@ -5781,7 +5763,7 @@ static void editing_host_page_real_on_increase_size (EditingHostPage* self) {
 	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
 #line 730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5781 "PhotoPage.c"
+#line 5763 "PhotoPage.c"
 }
 
 
@@ -5790,7 +5772,7 @@ void editing_host_page_on_increase_size (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 5790 "PhotoPage.c"
+#line 5772 "PhotoPage.c"
 }
 
 
@@ -5803,7 +5785,7 @@ static void editing_host_page_real_on_decrease_size (EditingHostPage* self) {
 	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
 #line 734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5803 "PhotoPage.c"
+#line 5785 "PhotoPage.c"
 }
 
 
@@ -5812,7 +5794,7 @@ void editing_host_page_on_decrease_size (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 5812 "PhotoPage.c"
+#line 5794 "PhotoPage.c"
 }
 
 
@@ -5830,7 +5812,7 @@ static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) {
 	_tmp1_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
 #line 739 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->saved_slider_val = _tmp1_;
-#line 5830 "PhotoPage.c"
+#line 5812 "PhotoPage.c"
 }
 
 
@@ -5849,7 +5831,7 @@ static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base
 	result = _tmp1_;
 #line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5849 "PhotoPage.c"
+#line 5831 "PhotoPage.c"
 }
 
 
@@ -5872,7 +5854,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 	if (_tmp2_) {
 #line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5872 "PhotoPage.c"
+#line 5854 "PhotoPage.c"
 	} else {
 		GtkScale* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -5882,7 +5864,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
 #line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 5882 "PhotoPage.c"
+#line 5864 "PhotoPage.c"
 	}
 #line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -5890,7 +5872,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 		result = FALSE;
 #line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 5890 "PhotoPage.c"
+#line 5872 "PhotoPage.c"
 	}
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
@@ -5900,7 +5882,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 	result = FALSE;
 #line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5900 "PhotoPage.c"
+#line 5882 "PhotoPage.c"
 }
 
 
@@ -5923,7 +5905,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 	if (_tmp2_) {
 #line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5923 "PhotoPage.c"
+#line 5905 "PhotoPage.c"
 	} else {
 		GtkScale* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -5933,7 +5915,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
 #line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 5933 "PhotoPage.c"
+#line 5915 "PhotoPage.c"
 	}
 #line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -5941,7 +5923,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 		result = FALSE;
 #line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 5941 "PhotoPage.c"
+#line 5923 "PhotoPage.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
@@ -5951,7 +5933,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 	result = FALSE;
 #line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5951 "PhotoPage.c"
+#line 5933 "PhotoPage.c"
 }
 
 
@@ -5982,7 +5964,7 @@ static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) {
 	_tmp4_ = self->priv->zoom_slider;
 #line 767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
-#line 5982 "PhotoPage.c"
+#line 5964 "PhotoPage.c"
 }
 
 
@@ -5995,7 +5977,7 @@ static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base)
 	result = TRUE;
 #line 771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5995 "PhotoPage.c"
+#line 5977 "PhotoPage.c"
 }
 
 
@@ -6015,7 +5997,7 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain
 	_tmp1_ = container;
 #line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 6015 "PhotoPage.c"
+#line 5997 "PhotoPage.c"
 		DragAndDropHandler* _tmp2_ = NULL;
 #line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6023,7 +6005,7 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain
 		_drag_and_drop_handler_unref0 (self->priv->dnd_handler);
 #line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->dnd_handler = _tmp2_;
-#line 6023 "PhotoPage.c"
+#line 6005 "PhotoPage.c"
 	}
 }
 
@@ -6042,7 +6024,7 @@ ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) {
 	result = _tmp1_;
 #line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6042 "PhotoPage.c"
+#line 6024 "PhotoPage.c"
 }
 
 
@@ -6065,7 +6047,7 @@ gboolean editing_host_page_has_photo (EditingHostPage* self) {
 	result = _tmp2_;
 #line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6065 "PhotoPage.c"
+#line 6047 "PhotoPage.c"
 }
 
 
@@ -6102,7 +6084,7 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
 		result = NULL;
 #line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 6102 "PhotoPage.c"
+#line 6084 "PhotoPage.c"
 	}
 #line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6134,7 +6116,7 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
 	result = _tmp12_;
 #line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6134 "PhotoPage.c"
+#line 6116 "PhotoPage.c"
 }
 
 
@@ -6152,7 +6134,7 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo*
 	if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
 #line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, FALSE);
-#line 6152 "PhotoPage.c"
+#line 6134 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
@@ -6170,13 +6152,13 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo*
 		editing_host_page_set_photo_missing (self, !_tmp5_);
 #line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6170 "PhotoPage.c"
+#line 6152 "PhotoPage.c"
 	}
 #line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->photo_missing;
 #line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_ui (self, _tmp6_);
-#line 6176 "PhotoPage.c"
+#line 6158 "PhotoPage.c"
 }
 
 
@@ -6185,7 +6167,7 @@ void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo)
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->photo_changing (self, new_photo);
-#line 6185 "PhotoPage.c"
+#line 6167 "PhotoPage.c"
 }
 
 
@@ -6290,7 +6272,7 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 	_tmp21_ = self->priv->parent_view;
 #line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_ != NULL) {
-#line 6290 "PhotoPage.c"
+#line 6272 "PhotoPage.c"
 		ViewCollection* _tmp22_ = NULL;
 		DataView* view_in_parent = NULL;
 		ViewCollection* _tmp23_ = NULL;
@@ -6313,7 +6295,7 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 		_tmp26_ = view_in_parent;
 #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (NULL != _tmp26_) {
-#line 6313 "PhotoPage.c"
+#line 6295 "PhotoPage.c"
 			ViewCollection* _tmp27_ = NULL;
 			ViewCollection* _tmp28_ = NULL;
 			DataView* _tmp29_ = NULL;
@@ -6333,17 +6315,17 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 			view_collection_select_marked (_tmp27_, _tmp31_);
 #line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp31_);
-#line 6333 "PhotoPage.c"
+#line 6315 "PhotoPage.c"
 		}
 #line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (view_in_parent);
-#line 6337 "PhotoPage.c"
+#line 6319 "PhotoPage.c"
 	}
 #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (marker);
 #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (view);
-#line 6343 "PhotoPage.c"
+#line 6325 "PhotoPage.c"
 }
 
 
@@ -6355,7 +6337,7 @@ static void editing_host_page_real_realize (GtkWidget* base) {
 	GTK_WIDGET_CLASS (editing_host_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget));
 #line 840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "realize");
-#line 6355 "PhotoPage.c"
+#line 6337 "PhotoPage.c"
 }
 
 
@@ -6373,21 +6355,21 @@ static void editing_host_page_real_switched_to (Page* base) {
 	_tmp1_ = editing_host_page_has_photo (self);
 #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6373 "PhotoPage.c"
+#line 6355 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = self->priv->pixbuf_dirty;
 #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 6379 "PhotoPage.c"
+#line 6361 "PhotoPage.c"
 	} else {
 #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 6383 "PhotoPage.c"
+#line 6365 "PhotoPage.c"
 	}
 #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6387 "PhotoPage.c"
+#line 6369 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 #line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6398,7 +6380,7 @@ static void editing_host_page_real_switched_to (Page* base) {
 		editing_host_page_replace_photo (self, _tmp4_);
 #line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6398 "PhotoPage.c"
+#line 6380 "PhotoPage.c"
 	}
 }
 
@@ -6426,21 +6408,21 @@ static void editing_host_page_real_switching_from (Page* base) {
 	_tmp2_ = editing_host_page_has_photo (self);
 #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 6426 "PhotoPage.c"
+#line 6408 "PhotoPage.c"
 		ViewCollection* _tmp3_ = NULL;
 #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->parent_view;
 #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 6432 "PhotoPage.c"
+#line 6414 "PhotoPage.c"
 	} else {
 #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6436 "PhotoPage.c"
+#line 6418 "PhotoPage.c"
 	}
 #line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6440 "PhotoPage.c"
+#line 6422 "PhotoPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
@@ -6476,7 +6458,7 @@ static void editing_host_page_real_switching_from (Page* base) {
 		_g_object_unref0 (_tmp10_);
 #line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 6476 "PhotoPage.c"
+#line 6458 "PhotoPage.c"
 	}
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->parent_view);
@@ -6490,14 +6472,14 @@ static void editing_host_page_real_switching_from (Page* base) {
 	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
 #line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 6490 "PhotoPage.c"
+#line 6472 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) {
 #line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_selection_changed ((EditingHostPage*) self, selected);
-#line 6497 "PhotoPage.c"
+#line 6479 "PhotoPage.c"
 }
 
 
@@ -6535,7 +6517,7 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre
 	_tmp4_ = page;
 #line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 6535 "PhotoPage.c"
+#line 6517 "PhotoPage.c"
 		Page* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
@@ -6549,11 +6531,11 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre
 		g_signal_connect_object (_tmp7_, "items-selected", (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self, 0);
 #line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6549 "PhotoPage.c"
+#line 6531 "PhotoPage.c"
 	}
 #line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6553 "PhotoPage.c"
+#line 6535 "PhotoPage.c"
 }
 
 
@@ -6584,7 +6566,7 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc
 	_tmp3_ = page;
 #line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6584 "PhotoPage.c"
+#line 6566 "PhotoPage.c"
 		Page* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
@@ -6601,11 +6583,11 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc
 		g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self);
 #line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 6601 "PhotoPage.c"
+#line 6583 "PhotoPage.c"
 	}
 #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6605 "PhotoPage.c"
+#line 6587 "PhotoPage.c"
 }
 
 
@@ -6614,7 +6596,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (selected));
-#line 6614 "PhotoPage.c"
+#line 6596 "PhotoPage.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_ = NULL;
@@ -6627,7 +6609,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 		_view_it = _tmp1_;
 #line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 6627 "PhotoPage.c"
+#line 6609 "PhotoPage.c"
 			gboolean _tmp2_ = FALSE;
 			DataView* view = NULL;
 			gpointer _tmp3_ = NULL;
@@ -6640,7 +6622,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 			if (!_tmp2_) {
 #line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 6640 "PhotoPage.c"
+#line 6622 "PhotoPage.c"
 			}
 #line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = gee_iterator_get (_view_it);
@@ -6660,11 +6642,11 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 			_g_object_unref0 (view);
 #line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 6660 "PhotoPage.c"
+#line 6642 "PhotoPage.c"
 		}
 #line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_view_it);
-#line 6664 "PhotoPage.c"
+#line 6646 "PhotoPage.c"
 	}
 }
 
@@ -6680,14 +6662,14 @@ void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_ena
 	_tmp1_ = should_enable;
 #line 905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 6680 "PhotoPage.c"
+#line 6662 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self) {
 #line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_pixbuf_fetched ((EditingHostPage*) self, photo, pixbuf, err);
-#line 6687 "PhotoPage.c"
+#line 6669 "PhotoPage.c"
 }
 
 
@@ -6696,7 +6678,7 @@ static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter
 	result = editing_host_page_master_cache_filter ((EditingHostPage*) self, photo);
 #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6696 "PhotoPage.c"
+#line 6678 "PhotoPage.c"
 }
 
 
@@ -6729,7 +6711,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	_tmp2_ = self->priv->cache;
 #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 6729 "PhotoPage.c"
+#line 6711 "PhotoPage.c"
 		PixbufCache* _tmp3_ = NULL;
 		Scaling _tmp4_ = {0};
 		Scaling _tmp5_ = {0};
@@ -6744,17 +6726,17 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 		_tmp6_ = scaling_equals (&_tmp4_, &_tmp5_);
 #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp6_;
-#line 6744 "PhotoPage.c"
+#line 6726 "PhotoPage.c"
 	} else {
 #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6748 "PhotoPage.c"
+#line 6730 "PhotoPage.c"
 	}
 #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
 #line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6754 "PhotoPage.c"
+#line 6736 "PhotoPage.c"
 	}
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = caller;
@@ -6770,7 +6752,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	_tmp10_ = self->priv->cache;
 #line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ != NULL) {
-#line 6770 "PhotoPage.c"
+#line 6752 "PhotoPage.c"
 		PixbufCache* _tmp11_ = NULL;
 		guint _tmp12_ = 0U;
 		PixbufCache* _tmp13_ = NULL;
@@ -6784,7 +6766,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 		_tmp13_ = self->priv->cache;
 #line 924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_cancel_all (_tmp13_);
-#line 6784 "PhotoPage.c"
+#line 6766 "PhotoPage.c"
 	}
 #line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = self->priv->sources;
@@ -6814,7 +6796,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	_tmp21_ = caller;
 #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, _tmp21_);
-#line 6814 "PhotoPage.c"
+#line 6796 "PhotoPage.c"
 }
 
 
@@ -6828,7 +6810,7 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6828 "PhotoPage.c"
+#line 6810 "PhotoPage.c"
 		const gchar* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
@@ -6869,14 +6851,14 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
 		_g_object_unref0 (_tmp9_);
 #line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6868 "PhotoPage.c"
+#line 6850 "PhotoPage.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
 #line 943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = caller;
 #line 943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_debug ("PhotoPage.vala:943: Refresh pixbuf caches (%s): (no photo)", _tmp10_);
-#line 6875 "PhotoPage.c"
+#line 6857 "PhotoPage.c"
 	}
 }
 
@@ -6898,7 +6880,7 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph
 	if (_tmp2_) {
 #line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 6897 "PhotoPage.c"
+#line 6879 "PhotoPage.c"
 	} else {
 		Photo* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -6908,13 +6890,13 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph
 		_tmp4_ = photo_has_editable (_tmp3_);
 #line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_;
-#line 6907 "PhotoPage.c"
+#line 6889 "PhotoPage.c"
 	}
 #line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_;
 #line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6913 "PhotoPage.c"
+#line 6895 "PhotoPage.c"
 }
 
 
@@ -6948,13 +6930,13 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 	if (_tmp4_) {
 #line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6947 "PhotoPage.c"
+#line 6929 "PhotoPage.c"
 	}
 #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = pixbuf;
 #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 6953 "PhotoPage.c"
+#line 6935 "PhotoPage.c"
 		gboolean _tmp6_ = FALSE;
 		ZoomBuffer* _tmp7_ = NULL;
 		Dimensions max_dim = {0};
@@ -6968,7 +6950,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		_tmp7_ = self->priv->zoom_buffer;
 #line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp7_ != NULL) {
-#line 6967 "PhotoPage.c"
+#line 6949 "PhotoPage.c"
 			ZoomBuffer* _tmp8_ = NULL;
 			Photo* _tmp9_ = NULL;
 			Photo* _tmp10_ = NULL;
@@ -6985,15 +6967,15 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 			_tmp6_ = _tmp10_ == _tmp11_;
 #line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp10_);
-#line 6984 "PhotoPage.c"
+#line 6966 "PhotoPage.c"
 		} else {
 #line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = FALSE;
-#line 6988 "PhotoPage.c"
+#line 6970 "PhotoPage.c"
 		}
 #line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 6992 "PhotoPage.c"
+#line 6974 "PhotoPage.c"
 			Photo* _tmp12_ = NULL;
 			GdkPixbuf* _tmp13_ = NULL;
 			ZoomBuffer* _tmp14_ = NULL;
@@ -7007,7 +6989,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 			_g_object_unref0 (self->priv->zoom_buffer);
 #line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			self->priv->zoom_buffer = _tmp14_;
-#line 7006 "PhotoPage.c"
+#line 6988 "PhotoPage.c"
 		}
 #line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = photo;
@@ -7019,7 +7001,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		_tmp17_ = self->priv->current_tool;
 #line 964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_ != NULL) {
-#line 7018 "PhotoPage.c"
+#line 7000 "PhotoPage.c"
 			{
 				Dimensions tool_pixbuf_dim = {0};
 				GdkPixbuf* tool_pixbuf = NULL;
@@ -7043,14 +7025,14 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				tool_pixbuf = _tmp22_;
 #line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7042 "PhotoPage.c"
+#line 7024 "PhotoPage.c"
 					goto __catch241_g_error;
 				}
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp23_ = tool_pixbuf;
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (_tmp23_ != NULL) {
-#line 7049 "PhotoPage.c"
+#line 7031 "PhotoPage.c"
 					GdkPixbuf* _tmp24_ = NULL;
 					Dimensions _tmp25_ = {0};
 #line 971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7061,11 +7043,11 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 					_tmp25_ = tool_pixbuf_dim;
 #line 972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					max_dim = _tmp25_;
-#line 7060 "PhotoPage.c"
+#line 7042 "PhotoPage.c"
 				}
 #line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (tool_pixbuf);
-#line 7064 "PhotoPage.c"
+#line 7046 "PhotoPage.c"
 			}
 			goto __finally241;
 			__catch241_g_error:
@@ -7100,7 +7082,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				_g_error_free0 (err);
 #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7099 "PhotoPage.c"
+#line 7081 "PhotoPage.c"
 			}
 			__finally241:
 #line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7111,7 +7093,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				g_clear_error (&_inner_error_);
 #line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7110 "PhotoPage.c"
+#line 7092 "PhotoPage.c"
 			}
 		}
 #line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7126,14 +7108,14 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		_tmp33_ = photo;
 #line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO, Photo), FALSE);
-#line 7125 "PhotoPage.c"
+#line 7107 "PhotoPage.c"
 	} else {
 		GError* _tmp34_ = NULL;
 #line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = err;
 #line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp34_ != NULL) {
-#line 7132 "PhotoPage.c"
+#line 7114 "PhotoPage.c"
 			Photo* _tmp35_ = NULL;
 #line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_set_photo_missing (self, TRUE);
@@ -7141,7 +7123,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 			_tmp35_ = photo;
 #line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo), TRUE);
-#line 7140 "PhotoPage.c"
+#line 7122 "PhotoPage.c"
 		}
 	}
 }
@@ -7225,7 +7207,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 		_g_object_unref0 (normal_batch);
 #line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 7224 "PhotoPage.c"
+#line 7206 "PhotoPage.c"
 	}
 #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = next_source;
@@ -7239,7 +7221,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo));
 #line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	prev = _tmp14_;
-#line 7238 "PhotoPage.c"
+#line 7220 "PhotoPage.c"
 	{
 		GeeIterator* _neighbor_source_it = NULL;
 		ViewCollection* _tmp15_ = NULL;
@@ -7266,7 +7248,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 		_neighbor_source_it = _tmp20_;
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7265 "PhotoPage.c"
+#line 7247 "PhotoPage.c"
 			GeeIterator* _tmp21_ = NULL;
 			gboolean _tmp22_ = FALSE;
 			DataSource* neighbor_source = NULL;
@@ -7293,7 +7275,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			if (!_tmp22_) {
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7292 "PhotoPage.c"
+#line 7274 "PhotoPage.c"
 			}
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = _neighbor_source_it;
@@ -7319,7 +7301,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			if (_tmp30_) {
 #line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = TRUE;
-#line 7318 "PhotoPage.c"
+#line 7300 "PhotoPage.c"
 			} else {
 				Photo* _tmp31_ = NULL;
 				Photo* _tmp32_ = NULL;
@@ -7332,13 +7314,13 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 				_tmp33_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_SOURCE, DataSource));
 #line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = _tmp33_;
-#line 7331 "PhotoPage.c"
+#line 7313 "PhotoPage.c"
 			}
 #line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp27_) {
 #line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				priority = BACKGROUND_JOB_JOB_PRIORITY_HIGH;
-#line 7337 "PhotoPage.c"
+#line 7319 "PhotoPage.c"
 			}
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp34_ = normal_batch;
@@ -7358,11 +7340,11 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			_g_object_unref0 (neighbor);
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (neighbor_source);
-#line 7357 "PhotoPage.c"
+#line 7339 "PhotoPage.c"
 		}
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_neighbor_source_it);
-#line 7361 "PhotoPage.c"
+#line 7343 "PhotoPage.c"
 	}
 #line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp39_ = self->priv->cache;
@@ -7388,7 +7370,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 	_g_object_unref0 (master_batch);
 #line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (normal_batch);
-#line 7387 "PhotoPage.c"
+#line 7369 "PhotoPage.c"
 }
 
 
@@ -7431,7 +7413,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 	_tmp5_ = view_collection_get_extended_neighbors (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
 #line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet);
-#line 7430 "PhotoPage.c"
+#line 7412 "PhotoPage.c"
 	{
 		GeeIterator* _old_neighbor_it = NULL;
 		GeeSet* _tmp6_ = NULL;
@@ -7444,7 +7426,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 		_old_neighbor_it = _tmp7_;
 #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7443 "PhotoPage.c"
+#line 7425 "PhotoPage.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			Photo* old_neighbor = NULL;
@@ -7462,7 +7444,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 			if (!_tmp9_) {
 #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7461 "PhotoPage.c"
+#line 7443 "PhotoPage.c"
 			}
 #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = _old_neighbor_it;
@@ -7478,7 +7460,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 			_tmp15_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_);
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp15_) {
-#line 7477 "PhotoPage.c"
+#line 7459 "PhotoPage.c"
 				Photo* _tmp16_ = NULL;
 				Photo* _tmp17_ = NULL;
 				gboolean _tmp18_ = FALSE;
@@ -7490,15 +7472,15 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 				_tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource));
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = !_tmp18_;
-#line 7489 "PhotoPage.c"
+#line 7471 "PhotoPage.c"
 			} else {
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = FALSE;
-#line 7493 "PhotoPage.c"
+#line 7475 "PhotoPage.c"
 			}
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp12_) {
-#line 7497 "PhotoPage.c"
+#line 7479 "PhotoPage.c"
 				PixbufCache* _tmp19_ = NULL;
 				Photo* _tmp20_ = NULL;
 				PixbufCache* _tmp21_ = NULL;
@@ -7515,15 +7497,15 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 				_tmp22_ = old_neighbor;
 #line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				pixbuf_cache_drop (_tmp21_, _tmp22_);
-#line 7514 "PhotoPage.c"
+#line 7496 "PhotoPage.c"
 			}
 #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (old_neighbor);
-#line 7518 "PhotoPage.c"
+#line 7500 "PhotoPage.c"
 		}
 #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_old_neighbor_it);
-#line 7522 "PhotoPage.c"
+#line 7504 "PhotoPage.c"
 	}
 #line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = new_neighbors;
@@ -7533,7 +7515,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 	_tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
 #line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 7532 "PhotoPage.c"
+#line 7514 "PhotoPage.c"
 		Photo* _tmp27_ = NULL;
 		Photo* _tmp28_ = NULL;
 		gboolean _tmp29_ = FALSE;
@@ -7545,15 +7527,15 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 		_tmp29_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource));
 #line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = !_tmp29_;
-#line 7544 "PhotoPage.c"
+#line 7526 "PhotoPage.c"
 	} else {
 #line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = FALSE;
-#line 7548 "PhotoPage.c"
+#line 7530 "PhotoPage.c"
 	}
 #line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp23_) {
-#line 7552 "PhotoPage.c"
+#line 7534 "PhotoPage.c"
 		PixbufCache* _tmp30_ = NULL;
 		Photo* _tmp31_ = NULL;
 		PixbufCache* _tmp32_ = NULL;
@@ -7570,13 +7552,13 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 		_tmp33_ = old_photo;
 #line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_drop (_tmp32_, _tmp33_);
-#line 7569 "PhotoPage.c"
+#line 7551 "PhotoPage.c"
 	}
 #line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (new_neighbors);
 #line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_neighbors);
-#line 7575 "PhotoPage.c"
+#line 7557 "PhotoPage.c"
 }
 
 
@@ -7594,7 +7576,7 @@ static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7593 "PhotoPage.c"
+#line 7575 "PhotoPage.c"
 }
 
 
@@ -7603,7 +7585,7 @@ DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->create_photo_view (self, source);
-#line 7602 "PhotoPage.c"
+#line 7584 "PhotoPage.c"
 }
 
 
@@ -7620,7 +7602,7 @@ static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* s
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_SOURCE);
 #line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7619 "PhotoPage.c"
+#line 7601 "PhotoPage.c"
 }
 
 
@@ -7629,7 +7611,7 @@ static DataView* _editing_host_page_create_photo_view_create_view (DataSource* s
 	result = editing_host_page_create_photo_view ((EditingHostPage*) self, source);
 #line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7628 "PhotoPage.c"
+#line 7610 "PhotoPage.c"
 }
 
 
@@ -7638,7 +7620,7 @@ static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* s
 	result = editing_host_page_is_photo ((EditingHostPage*) self, source);
 #line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7637 "PhotoPage.c"
+#line 7619 "PhotoPage.c"
 }
 
 
@@ -7683,7 +7665,7 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 	_data_collection_unref0 (_tmp7_);
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7682 "PhotoPage.c"
+#line 7664 "PhotoPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7692,15 +7674,15 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 		_tmp10_ = self->priv->parent_view;
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7691 "PhotoPage.c"
+#line 7673 "PhotoPage.c"
 	} else {
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7695 "PhotoPage.c"
+#line 7677 "PhotoPage.c"
 	}
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7699 "PhotoPage.c"
+#line 7681 "PhotoPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
@@ -7734,13 +7716,13 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 		_data_collection_unref0 (self->priv->parent_view);
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7733 "PhotoPage.c"
+#line 7715 "PhotoPage.c"
 	}
 #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
 #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7739 "PhotoPage.c"
+#line 7721 "PhotoPage.c"
 }
 
 
@@ -7785,7 +7767,7 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 	_data_collection_unref0 (_tmp7_);
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7784 "PhotoPage.c"
+#line 7766 "PhotoPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7794,15 +7776,15 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 		_tmp10_ = self->priv->parent_view;
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7793 "PhotoPage.c"
+#line 7775 "PhotoPage.c"
 	} else {
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7797 "PhotoPage.c"
+#line 7779 "PhotoPage.c"
 	}
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7801 "PhotoPage.c"
+#line 7783 "PhotoPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
@@ -7836,13 +7818,13 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 		_data_collection_unref0 (self->priv->parent_view);
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7835 "PhotoPage.c"
+#line 7817 "PhotoPage.c"
 	}
 #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
 #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7841 "PhotoPage.c"
+#line 7823 "PhotoPage.c"
 }
 
 
@@ -7893,7 +7875,7 @@ static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean mi
 	dimensions_init (&_tmp8_, 0, 0);
 #line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp8_, FALSE);
-#line 7892 "PhotoPage.c"
+#line 7874 "PhotoPage.c"
 }
 
 
@@ -7902,14 +7884,14 @@ void editing_host_page_update_ui (EditingHostPage* self, gboolean missing) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->update_ui (self, missing);
-#line 7901 "PhotoPage.c"
+#line 7883 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) {
 #line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 7908 "PhotoPage.c"
+#line 7890 "PhotoPage.c"
 }
 
 
@@ -7918,7 +7900,7 @@ void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Phot
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->notify_photo_backing_missing (self, photo, missing);
-#line 7917 "PhotoPage.c"
+#line 7899 "PhotoPage.c"
 }
 
 
@@ -7982,17 +7964,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	_tmp10_ = x;
 #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ > 0) {
-#line 7981 "PhotoPage.c"
+#line 7963 "PhotoPage.c"
 		gint _tmp11_ = 0;
 #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = x;
 #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp11_ / 2;
-#line 7987 "PhotoPage.c"
+#line 7969 "PhotoPage.c"
 	} else {
 #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = 0;
-#line 7991 "PhotoPage.c"
+#line 7973 "PhotoPage.c"
 	}
 #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	x = _tmp9_;
@@ -8008,17 +7990,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	_tmp16_ = y;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_ > 0) {
-#line 8007 "PhotoPage.c"
+#line 7989 "PhotoPage.c"
 		gint _tmp17_ = 0;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = y;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp17_ / 2;
-#line 8013 "PhotoPage.c"
+#line 7995 "PhotoPage.c"
 	} else {
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = 0;
-#line 8017 "PhotoPage.c"
+#line 7999 "PhotoPage.c"
 	}
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	y = _tmp15_;
@@ -8032,7 +8014,7 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	single_photo_page_paint_text (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp18_, _tmp19_, _tmp20_);
 #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pango_layout);
-#line 8031 "PhotoPage.c"
+#line 8013 "PhotoPage.c"
 }
 
 
@@ -8056,7 +8038,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 	if (_tmp0_ == _tmp1_) {
 #line 1122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8055 "PhotoPage.c"
+#line 8037 "PhotoPage.c"
 	}
 #line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = missing;
@@ -8074,7 +8056,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 		_g_object_unref0 (photo);
 #line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8073 "PhotoPage.c"
+#line 8055 "PhotoPage.c"
 	}
 #line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = missing;
@@ -8084,7 +8066,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 	_tmp6_ = self->priv->photo_missing;
 #line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8083 "PhotoPage.c"
+#line 8065 "PhotoPage.c"
 		{
 			GdkPixbuf* pixbuf = NULL;
 			Photo* _tmp7_ = NULL;
@@ -8109,7 +8091,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			pixbuf = _tmp9_;
 #line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8108 "PhotoPage.c"
+#line 8090 "PhotoPage.c"
 				goto __catch242_g_error;
 			}
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8138,7 +8120,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp16_, &_tmp18_, NULL);
 #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 8137 "PhotoPage.c"
+#line 8119 "PhotoPage.c"
 		}
 		goto __finally242;
 		__catch242_g_error:
@@ -8174,7 +8156,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			g_warning ("PhotoPage.vala:1142: %s", _tmp24_);
 #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8173 "PhotoPage.c"
+#line 8155 "PhotoPage.c"
 		}
 		__finally242:
 #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8187,12 +8169,12 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			g_clear_error (&_inner_error_);
 #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8186 "PhotoPage.c"
+#line 8168 "PhotoPage.c"
 		}
 	}
 #line 1120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 8191 "PhotoPage.c"
+#line 8173 "PhotoPage.c"
 }
 
 
@@ -8207,7 +8189,7 @@ gboolean editing_host_page_get_photo_missing (EditingHostPage* self) {
 	result = _tmp0_;
 #line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8206 "PhotoPage.c"
+#line 8188 "PhotoPage.c"
 }
 
 
@@ -8221,7 +8203,7 @@ static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* s
 	result = TRUE;
 #line 1152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8220 "PhotoPage.c"
+#line 8202 "PhotoPage.c"
 }
 
 
@@ -8230,7 +8212,7 @@ gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo*
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->confirm_replace_photo (self, old_photo, new_photo);
-#line 8229 "PhotoPage.c"
+#line 8211 "PhotoPage.c"
 }
 
 
@@ -8259,7 +8241,7 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 	_tmp3_ = pixbuf;
 #line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 8258 "PhotoPage.c"
+#line 8240 "PhotoPage.c"
 		{
 			GdkPixbuf* _tmp4_ = NULL;
 			Photo* _tmp5_ = NULL;
@@ -8276,7 +8258,7 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			_tmp4_ = _tmp7_;
 #line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8275 "PhotoPage.c"
+#line 8257 "PhotoPage.c"
 				goto __catch243_g_error;
 			}
 #line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8289,7 +8271,7 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			pixbuf = _tmp8_;
 #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp4_);
-#line 8288 "PhotoPage.c"
+#line 8270 "PhotoPage.c"
 		}
 		goto __finally243;
 		__catch243_g_error:
@@ -8309,7 +8291,7 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			g_warning ("PhotoPage.vala:1161: %s", _tmp10_);
 #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8308 "PhotoPage.c"
+#line 8290 "PhotoPage.c"
 		}
 		__finally243:
 #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8322,14 +8304,14 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			g_clear_error (&_inner_error_);
 #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return NULL;
-#line 8321 "PhotoPage.c"
+#line 8303 "PhotoPage.c"
 		}
 	}
 #line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = pixbuf;
 #line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 8328 "PhotoPage.c"
+#line 8310 "PhotoPage.c"
 		GdkPixbuf* _tmp12_ = NULL;
 		Scaling _tmp13_ = {0};
 		GdkPixbuf* _tmp14_ = NULL;
@@ -8351,13 +8333,13 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 		_tmp16_ = _tmp15_;
 #line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 8350 "PhotoPage.c"
+#line 8332 "PhotoPage.c"
 	}
 #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = pixbuf;
 #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8356 "PhotoPage.c"
+#line 8338 "PhotoPage.c"
 }
 
 
@@ -8407,35 +8389,35 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	_g_object_unref0 (_tmp4_);
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8406 "PhotoPage.c"
+#line 8388 "PhotoPage.c"
 		gboolean _tmp7_ = FALSE;
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = self->priv->pixbuf_dirty;
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp7_;
-#line 8412 "PhotoPage.c"
+#line 8394 "PhotoPage.c"
 	} else {
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 8416 "PhotoPage.c"
+#line 8398 "PhotoPage.c"
 	}
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 8420 "PhotoPage.c"
+#line 8402 "PhotoPage.c"
 		gboolean _tmp8_ = FALSE;
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = self->priv->photo_missing;
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp8_;
-#line 8426 "PhotoPage.c"
+#line 8408 "PhotoPage.c"
 	} else {
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 8430 "PhotoPage.c"
+#line 8412 "PhotoPage.c"
 	}
 #line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 8434 "PhotoPage.c"
+#line 8416 "PhotoPage.c"
 		Photo* _tmp9_ = NULL;
 		Photo* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
@@ -8459,13 +8441,13 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		_g_object_unref0 (_tmp12_);
 #line 1178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8458 "PhotoPage.c"
+#line 8440 "PhotoPage.c"
 	}
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = editing_host_page_has_photo (self);
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_) {
-#line 8464 "PhotoPage.c"
+#line 8446 "PhotoPage.c"
 		Photo* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
 		Photo* _tmp19_ = NULL;
@@ -8482,25 +8464,25 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		_tmp15_ = !_tmp20_;
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 8481 "PhotoPage.c"
+#line 8463 "PhotoPage.c"
 	} else {
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = FALSE;
-#line 8485 "PhotoPage.c"
+#line 8467 "PhotoPage.c"
 	}
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = editing_host_page_confirm_replace_photo != NULL;
-#line 8491 "PhotoPage.c"
+#line 8473 "PhotoPage.c"
 	} else {
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 8495 "PhotoPage.c"
+#line 8477 "PhotoPage.c"
 	}
 #line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_) {
-#line 8499 "PhotoPage.c"
+#line 8481 "PhotoPage.c"
 		Photo* _tmp21_ = NULL;
 		Photo* _tmp22_ = NULL;
 		Photo* _tmp23_ = NULL;
@@ -8522,7 +8504,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		if (_tmp25_) {
 #line 1184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8521 "PhotoPage.c"
+#line 8503 "PhotoPage.c"
 		}
 	}
 #line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8571,7 +8553,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	_tmp36_ = old_photo;
 #line 1205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp36_ != NULL) {
-#line 8570 "PhotoPage.c"
+#line 8552 "PhotoPage.c"
 		ViewCollection* _tmp37_ = NULL;
 		ViewCollection* _tmp38_ = NULL;
 		Photo* _tmp39_ = NULL;
@@ -8596,7 +8578,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		_data_collection_unref0 (_tmp41_);
 #line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 8595 "PhotoPage.c"
+#line 8577 "PhotoPage.c"
 	}
 #line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -8622,7 +8604,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	editing_host_page_refresh_caches (self, "replace_photo");
 #line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_photo);
-#line 8621 "PhotoPage.c"
+#line 8603 "PhotoPage.c"
 }
 
 
@@ -8665,7 +8647,7 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 	_g_object_unref0 (_tmp5_);
 #line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8664 "PhotoPage.c"
+#line 8646 "PhotoPage.c"
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
@@ -8685,13 +8667,13 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 		single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_);
 #line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 8684 "PhotoPage.c"
+#line 8666 "PhotoPage.c"
 	}
 #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
 #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 8690 "PhotoPage.c"
+#line 8672 "PhotoPage.c"
 		GtkDrawingArea* _tmp14_ = NULL;
 		GdkWindow* _tmp15_ = NULL;
 #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8700,21 +8682,21 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 		_tmp15_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
 #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp15_ != NULL;
-#line 8699 "PhotoPage.c"
+#line 8681 "PhotoPage.c"
 	} else {
 #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 8703 "PhotoPage.c"
+#line 8685 "PhotoPage.c"
 	}
 #line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
 #line 1233 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR);
-#line 8709 "PhotoPage.c"
+#line 8691 "PhotoPage.c"
 	}
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 8713 "PhotoPage.c"
+#line 8695 "PhotoPage.c"
 }
 
 
@@ -8758,7 +8740,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	_tmp5_ = pixbuf;
 #line 1240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 8757 "PhotoPage.c"
+#line 8739 "PhotoPage.c"
 		GdkPixbuf* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
@@ -8781,7 +8763,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (pixbuf);
 #line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8780 "PhotoPage.c"
+#line 8762 "PhotoPage.c"
 	}
 #line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_);
@@ -8807,7 +8789,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	_g_free0 (_tmp14_);
 #line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 8806 "PhotoPage.c"
+#line 8788 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
@@ -8834,7 +8816,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_tmp17_ = _tmp22_;
 #line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8833 "PhotoPage.c"
+#line 8815 "PhotoPage.c"
 			goto __catch244_g_error;
 		}
 #line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8849,7 +8831,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (_tmp24_);
 #line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 8848 "PhotoPage.c"
+#line 8830 "PhotoPage.c"
 	}
 	goto __finally244;
 	__catch244_g_error:
@@ -8869,7 +8851,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		g_warning ("PhotoPage.vala:1256: %s", _tmp27_);
 #line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 8868 "PhotoPage.c"
+#line 8850 "PhotoPage.c"
 	}
 	__finally244:
 #line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8882,7 +8864,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8881 "PhotoPage.c"
+#line 8863 "PhotoPage.c"
 	}
 #line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->cache;
@@ -8898,7 +8880,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	self->priv->pixbuf_dirty = FALSE;
 #line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 8897 "PhotoPage.c"
+#line 8879 "PhotoPage.c"
 }
 
 
@@ -8931,7 +8913,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (photo);
 #line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 8930 "PhotoPage.c"
+#line 8912 "PhotoPage.c"
 	}
 #line 1275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = NULL;
@@ -8941,7 +8923,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
 #line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp3_;
-#line 8940 "PhotoPage.c"
+#line 8922 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp4_ = {0};
@@ -8955,7 +8937,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		_tmp5_ = self->priv->current_tool;
 #line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_ != NULL) {
-#line 8954 "PhotoPage.c"
+#line 8936 "PhotoPage.c"
 			GdkPixbuf* _tmp6_ = NULL;
 			EditingToolsEditingTool* _tmp7_ = NULL;
 			Scaling _tmp8_ = {0};
@@ -8977,7 +8959,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_tmp6_ = _tmp11_;
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8976 "PhotoPage.c"
+#line 8958 "PhotoPage.c"
 				goto __catch245_g_error;
 			}
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8990,19 +8972,19 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			pixbuf = _tmp12_;
 #line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp6_);
-#line 8989 "PhotoPage.c"
+#line 8971 "PhotoPage.c"
 		}
 #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = pixbuf;
 #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp13_ != NULL) {
-#line 8995 "PhotoPage.c"
+#line 8977 "PhotoPage.c"
 			Dimensions _tmp14_ = {0};
 #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = tool_pixbuf_dim;
 #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp14_;
-#line 9001 "PhotoPage.c"
+#line 8983 "PhotoPage.c"
 		}
 	}
 	goto __finally245;
@@ -9025,7 +9007,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		editing_host_page_set_photo_missing (self, TRUE);
 #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 9024 "PhotoPage.c"
+#line 9006 "PhotoPage.c"
 	}
 	__finally245:
 #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9040,20 +9022,20 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return FALSE;
-#line 9039 "PhotoPage.c"
+#line 9021 "PhotoPage.c"
 	}
 #line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = self->priv->photo_missing;
 #line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp17_) {
-#line 9045 "PhotoPage.c"
+#line 9027 "PhotoPage.c"
 		GdkPixbuf* _tmp18_ = NULL;
 		GdkPixbuf* _tmp22_ = NULL;
 #line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = pixbuf;
 #line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp18_ == NULL) {
-#line 9052 "PhotoPage.c"
+#line 9034 "PhotoPage.c"
 			PixbufCache* _tmp19_ = NULL;
 			Photo* _tmp20_ = NULL;
 			GdkPixbuf* _tmp21_ = NULL;
@@ -9067,13 +9049,13 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_g_object_unref0 (pixbuf);
 #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp21_;
-#line 9066 "PhotoPage.c"
+#line 9048 "PhotoPage.c"
 		}
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = pixbuf;
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp22_ == NULL) {
-#line 9072 "PhotoPage.c"
+#line 9054 "PhotoPage.c"
 			PixbufCache* _tmp23_ = NULL;
 			Photo* _tmp24_ = NULL;
 #line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9082,28 +9064,28 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_tmp24_ = photo;
 #line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf_cache_prefetch (_tmp23_, _tmp24_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
-#line 9081 "PhotoPage.c"
+#line 9063 "PhotoPage.c"
 		}
 	}
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = self->priv->photo_missing;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 9088 "PhotoPage.c"
+#line 9070 "PhotoPage.c"
 		GdkPixbuf* _tmp27_ = NULL;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = pixbuf;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = _tmp27_ != NULL;
-#line 9094 "PhotoPage.c"
+#line 9076 "PhotoPage.c"
 	} else {
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = FALSE;
-#line 9098 "PhotoPage.c"
+#line 9080 "PhotoPage.c"
 	}
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp25_) {
-#line 9102 "PhotoPage.c"
+#line 9084 "PhotoPage.c"
 		GdkPixbuf* _tmp28_ = NULL;
 		Dimensions _tmp29_ = {0};
 #line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9114,7 +9096,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp28_, &_tmp29_, NULL);
 #line 1302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = FALSE;
-#line 9113 "PhotoPage.c"
+#line 9095 "PhotoPage.c"
 	}
 #line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
@@ -9124,7 +9106,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	_g_object_unref0 (photo);
 #line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9123 "PhotoPage.c"
+#line 9105 "PhotoPage.c"
 }
 
 
@@ -9141,7 +9123,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 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_track_tool_window (self);
-#line 9140 "PhotoPage.c"
+#line 9122 "PhotoPage.c"
 }
 
 
@@ -9157,7 +9139,7 @@ static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle*
 	self->priv->pixbuf_dirty = TRUE;
 #line 1325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9156 "PhotoPage.c"
+#line 9138 "PhotoPage.c"
 }
 
 
@@ -9170,7 +9152,7 @@ static void editing_host_page_on_viewport_resized (EditingHostPage* self) {
 	self->priv->pixbuf_dirty = TRUE;
 #line 1334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9169 "PhotoPage.c"
+#line 9151 "PhotoPage.c"
 }
 
 
@@ -9254,21 +9236,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp13_ = photo;
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 9253 "PhotoPage.c"
+#line 9235 "PhotoPage.c"
 		gboolean _tmp14_ = FALSE;
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = self->priv->photo_missing;
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = !_tmp14_;
-#line 9259 "PhotoPage.c"
+#line 9241 "PhotoPage.c"
 	} else {
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 9263 "PhotoPage.c"
+#line 9245 "PhotoPage.c"
 	}
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 9267 "PhotoPage.c"
+#line 9249 "PhotoPage.c"
 		Photo* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9277,15 +9259,15 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp16_ = photo_check_can_rotate (_tmp15_);
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp16_;
-#line 9276 "PhotoPage.c"
+#line 9258 "PhotoPage.c"
 	} else {
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = FALSE;
-#line 9280 "PhotoPage.c"
+#line 9262 "PhotoPage.c"
 	}
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_) {
-#line 9284 "PhotoPage.c"
+#line 9266 "PhotoPage.c"
 		Photo* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
 #line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9294,11 +9276,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_);
 #line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp18_;
-#line 9293 "PhotoPage.c"
+#line 9275 "PhotoPage.c"
 	} else {
 #line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 9297 "PhotoPage.c"
+#line 9279 "PhotoPage.c"
 	}
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = self->priv->rotate_button;
@@ -9308,21 +9290,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp22_ = photo;
 #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 9307 "PhotoPage.c"
+#line 9289 "PhotoPage.c"
 		gboolean _tmp23_ = FALSE;
 #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = self->priv->photo_missing;
 #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = !_tmp23_;
-#line 9313 "PhotoPage.c"
+#line 9295 "PhotoPage.c"
 	} else {
 #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = FALSE;
-#line 9317 "PhotoPage.c"
+#line 9299 "PhotoPage.c"
 	}
 #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 9321 "PhotoPage.c"
+#line 9303 "PhotoPage.c"
 		Photo* _tmp24_ = NULL;
 		Scaling _tmp25_ = {0};
 		gboolean _tmp26_ = FALSE;
@@ -9334,11 +9316,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp26_ = editing_tools_crop_tool_is_available (_tmp24_, &_tmp25_);
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp26_;
-#line 9333 "PhotoPage.c"
+#line 9315 "PhotoPage.c"
 	} else {
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 9337 "PhotoPage.c"
+#line 9319 "PhotoPage.c"
 	}
 #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->crop_button;
@@ -9348,21 +9330,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp30_ = photo;
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_ != NULL) {
-#line 9347 "PhotoPage.c"
+#line 9329 "PhotoPage.c"
 		gboolean _tmp31_ = FALSE;
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = self->priv->photo_missing;
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = !_tmp31_;
-#line 9353 "PhotoPage.c"
+#line 9335 "PhotoPage.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = FALSE;
-#line 9357 "PhotoPage.c"
+#line 9339 "PhotoPage.c"
 	}
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_) {
-#line 9361 "PhotoPage.c"
+#line 9343 "PhotoPage.c"
 		Photo* _tmp32_ = NULL;
 		Scaling _tmp33_ = {0};
 		gboolean _tmp34_ = FALSE;
@@ -9374,11 +9356,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp34_ = editing_tools_redeye_tool_is_available (_tmp32_, &_tmp33_);
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = _tmp34_;
-#line 9373 "PhotoPage.c"
+#line 9355 "PhotoPage.c"
 	} else {
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = FALSE;
-#line 9377 "PhotoPage.c"
+#line 9359 "PhotoPage.c"
 	}
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = self->priv->redeye_button;
@@ -9388,21 +9370,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp38_ = photo;
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp38_ != NULL) {
-#line 9387 "PhotoPage.c"
+#line 9369 "PhotoPage.c"
 		gboolean _tmp39_ = FALSE;
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = self->priv->photo_missing;
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = !_tmp39_;
-#line 9393 "PhotoPage.c"
+#line 9375 "PhotoPage.c"
 	} else {
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = FALSE;
-#line 9397 "PhotoPage.c"
+#line 9379 "PhotoPage.c"
 	}
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp37_) {
-#line 9401 "PhotoPage.c"
+#line 9383 "PhotoPage.c"
 		Photo* _tmp40_ = NULL;
 		Scaling _tmp41_ = {0};
 		gboolean _tmp42_ = FALSE;
@@ -9414,11 +9396,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp42_ = editing_tools_adjust_tool_is_available (_tmp40_, &_tmp41_);
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = _tmp42_;
-#line 9413 "PhotoPage.c"
+#line 9395 "PhotoPage.c"
 	} else {
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = FALSE;
-#line 9417 "PhotoPage.c"
+#line 9399 "PhotoPage.c"
 	}
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = self->priv->adjust_button;
@@ -9428,21 +9410,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp46_ = photo;
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_ != NULL) {
-#line 9427 "PhotoPage.c"
+#line 9409 "PhotoPage.c"
 		gboolean _tmp47_ = FALSE;
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = self->priv->photo_missing;
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = !_tmp47_;
-#line 9433 "PhotoPage.c"
+#line 9415 "PhotoPage.c"
 	} else {
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = FALSE;
-#line 9437 "PhotoPage.c"
+#line 9419 "PhotoPage.c"
 	}
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp45_) {
-#line 9441 "PhotoPage.c"
+#line 9423 "PhotoPage.c"
 		Photo* _tmp48_ = NULL;
 		gboolean _tmp49_ = FALSE;
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9451,11 +9433,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_);
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = _tmp49_;
-#line 9450 "PhotoPage.c"
+#line 9432 "PhotoPage.c"
 	} else {
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = FALSE;
-#line 9454 "PhotoPage.c"
+#line 9436 "PhotoPage.c"
 	}
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp50_ = self->priv->enhance_button;
@@ -9465,21 +9447,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp53_ = photo;
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp53_ != NULL) {
-#line 9464 "PhotoPage.c"
+#line 9446 "PhotoPage.c"
 		gboolean _tmp54_ = FALSE;
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp54_ = self->priv->photo_missing;
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = !_tmp54_;
-#line 9470 "PhotoPage.c"
+#line 9452 "PhotoPage.c"
 	} else {
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = FALSE;
-#line 9474 "PhotoPage.c"
+#line 9456 "PhotoPage.c"
 	}
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp52_) {
-#line 9478 "PhotoPage.c"
+#line 9460 "PhotoPage.c"
 		Photo* _tmp55_ = NULL;
 		Scaling _tmp56_ = {0};
 		gboolean _tmp57_ = FALSE;
@@ -9491,11 +9473,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp57_ = editing_tools_straighten_tool_is_available (_tmp55_, &_tmp56_);
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = _tmp57_;
-#line 9490 "PhotoPage.c"
+#line 9472 "PhotoPage.c"
 	} else {
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = FALSE;
-#line 9494 "PhotoPage.c"
+#line 9476 "PhotoPage.c"
 	}
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp58_ = self->priv->straighten_button;
@@ -9509,7 +9491,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 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 9508 "PhotoPage.c"
+#line 9490 "PhotoPage.c"
 }
 
 
@@ -9528,51 +9510,51 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
 	_tmp3_ = self->priv->current_tool;
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 9527 "PhotoPage.c"
+#line 9509 "PhotoPage.c"
 		gboolean _tmp4_ = FALSE;
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = !_tmp4_;
-#line 9533 "PhotoPage.c"
+#line 9515 "PhotoPage.c"
 	} else {
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = FALSE;
-#line 9537 "PhotoPage.c"
+#line 9519 "PhotoPage.c"
 	}
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 9541 "PhotoPage.c"
+#line 9523 "PhotoPage.c"
 		gboolean _tmp5_ = FALSE;
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp5_;
-#line 9547 "PhotoPage.c"
+#line 9529 "PhotoPage.c"
 	} else {
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9551 "PhotoPage.c"
+#line 9533 "PhotoPage.c"
 	}
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9555 "PhotoPage.c"
+#line 9537 "PhotoPage.c"
 		gboolean _tmp6_ = FALSE;
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_has_photo (self);
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp6_;
-#line 9561 "PhotoPage.c"
+#line 9543 "PhotoPage.c"
 	} else {
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9565 "PhotoPage.c"
+#line 9547 "PhotoPage.c"
 	}
 #line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9571 "PhotoPage.c"
+#line 9553 "PhotoPage.c"
 	}
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
@@ -9582,7 +9564,7 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
 	result = _tmp8_;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9581 "PhotoPage.c"
+#line 9563 "PhotoPage.c"
 }
 
 
@@ -9600,7 +9582,7 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
 	if (_tmp0_ == NULL) {
 #line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9599 "PhotoPage.c"
+#line 9581 "PhotoPage.c"
 	}
 #line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -9610,7 +9592,7 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
 	result = _tmp2_;
 #line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9609 "PhotoPage.c"
+#line 9591 "PhotoPage.c"
 }
 
 
@@ -9628,7 +9610,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
 	if (_tmp0_ == NULL) {
 #line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9627 "PhotoPage.c"
+#line 9609 "PhotoPage.c"
 	}
 #line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -9638,7 +9620,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
 	result = _tmp2_;
 #line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9637 "PhotoPage.c"
+#line 9619 "PhotoPage.c"
 }
 
 
@@ -9656,37 +9638,37 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
 	_tmp2_ = self->priv->current_tool;
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 9655 "PhotoPage.c"
+#line 9637 "PhotoPage.c"
 		gboolean _tmp3_ = FALSE;
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_;
-#line 9661 "PhotoPage.c"
+#line 9643 "PhotoPage.c"
 	} else {
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9665 "PhotoPage.c"
+#line 9647 "PhotoPage.c"
 	}
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9669 "PhotoPage.c"
+#line 9651 "PhotoPage.c"
 		gboolean _tmp4_ = FALSE;
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 9675 "PhotoPage.c"
+#line 9657 "PhotoPage.c"
 	} else {
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9679 "PhotoPage.c"
+#line 9661 "PhotoPage.c"
 	}
 #line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9685 "PhotoPage.c"
+#line 9667 "PhotoPage.c"
 	}
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
@@ -9696,7 +9678,7 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
 	result = _tmp6_;
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9695 "PhotoPage.c"
+#line 9677 "PhotoPage.c"
 }
 
 
@@ -9712,7 +9694,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 	GError * _inner_error_ = NULL;
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 9711 "PhotoPage.c"
+#line 9693 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_ = NULL;
@@ -9737,7 +9719,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_tmp0_ = _tmp4_;
 #line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9736 "PhotoPage.c"
+#line 9718 "PhotoPage.c"
 			goto __catch246_g_error;
 		}
 #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9756,7 +9738,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_g_object_unref0 (_tmp6_);
 #line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 9755 "PhotoPage.c"
+#line 9737 "PhotoPage.c"
 	}
 	goto __finally246;
 	__catch246_g_error:
@@ -9772,7 +9754,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_g_object_unref0 (original);
 #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9771 "PhotoPage.c"
+#line 9753 "PhotoPage.c"
 	}
 	__finally246:
 #line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9785,7 +9767,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9784 "PhotoPage.c"
+#line 9766 "PhotoPage.c"
 	}
 #line 1401 "/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 +9785,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 1407 "/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 9784 "PhotoPage.c"
 	}
 #line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = original;
@@ -9819,7 +9801,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 	_g_object_unref0 (_tmp14_);
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (original);
-#line 9818 "PhotoPage.c"
+#line 9800 "PhotoPage.c"
 }
 
 
@@ -9831,7 +9813,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 	_tmp0_ = self->priv->swapped;
 #line 1414 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 9830 "PhotoPage.c"
+#line 9812 "PhotoPage.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
@@ -9856,7 +9838,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 		_g_object_unref0 (self->priv->swapped);
 #line 1421 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->swapped = NULL;
-#line 9855 "PhotoPage.c"
+#line 9837 "PhotoPage.c"
 	}
 }
 
@@ -9864,7 +9846,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 static gpointer _editing_tools_editing_tool_ref0 (gpointer self) {
 #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? editing_tools_editing_tool_ref (self) : NULL;
-#line 9863 "PhotoPage.c"
+#line 9845 "PhotoPage.c"
 }
 
 
@@ -9915,7 +9897,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	_g_object_unref0 (_tmp3_);
 #line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp5_;
-#line 9914 "PhotoPage.c"
+#line 9896 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp6_ = {0};
@@ -9953,7 +9935,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_tmp7_ = _tmp14_;
 #line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9952 "PhotoPage.c"
+#line 9934 "PhotoPage.c"
 			goto __catch247_g_error;
 		}
 #line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9968,17 +9950,17 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_tmp16_ = unscaled;
 #line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp16_ != NULL) {
-#line 9967 "PhotoPage.c"
+#line 9949 "PhotoPage.c"
 			Dimensions _tmp17_ = {0};
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = tool_pixbuf_dim;
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp17_;
-#line 9973 "PhotoPage.c"
+#line 9955 "PhotoPage.c"
 		}
 #line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 9977 "PhotoPage.c"
+#line 9959 "PhotoPage.c"
 	}
 	goto __finally247;
 	__catch247_g_error:
@@ -10014,7 +9996,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_g_object_unref0 (unscaled);
 #line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10013 "PhotoPage.c"
+#line 9995 "PhotoPage.c"
 	}
 	__finally247:
 #line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10027,13 +10009,13 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		g_clear_error (&_inner_error_);
 #line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10026 "PhotoPage.c"
+#line 10008 "PhotoPage.c"
 	}
 #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = unscaled;
 #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 10032 "PhotoPage.c"
+#line 10014 "PhotoPage.c"
 		GdkPixbuf* _tmp23_ = NULL;
 		Dimensions _tmp24_ = {0};
 #line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10042,7 +10024,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_tmp24_ = max_dim;
 #line 1459 "/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 10023 "PhotoPage.c"
 	}
 #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = editing_host_page_editing_host_canvas_new (self);
@@ -10070,42 +10052,42 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	_editing_tools_photo_canvas_unref0 (photo_canvas);
 #line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (unscaled);
-#line 10069 "PhotoPage.c"
+#line 10051 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_activated ((EditingHostPage*) self);
-#line 10076 "PhotoPage.c"
+#line 10058 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_deactivated ((EditingHostPage*) self);
-#line 10083 "PhotoPage.c"
+#line 10065 "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 1498 "/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 10072 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_cancelled ((EditingHostPage*) self);
-#line 10097 "PhotoPage.c"
+#line 10079 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_aborted ((EditingHostPage*) self);
-#line 10104 "PhotoPage.c"
+#line 10086 "PhotoPage.c"
 }
 
 
@@ -10114,7 +10096,7 @@ static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self) {
 	result = editing_host_page_update_pixbuf ((EditingHostPage*) self);
 #line 1527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10113 "PhotoPage.c"
+#line 10095 "PhotoPage.c"
 }
 
 
@@ -10158,7 +10140,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	if (_tmp0_ == NULL) {
 #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10157 "PhotoPage.c"
+#line 10139 "PhotoPage.c"
 	}
 #line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
@@ -10180,7 +10162,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_tmp6_ = tool_window;
 #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ != NULL) {
-#line 10179 "PhotoPage.c"
+#line 10161 "PhotoPage.c"
 		EditingToolsEditingToolWindow* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
 #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10189,15 +10171,15 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		_tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_);
 #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp8_;
-#line 10188 "PhotoPage.c"
+#line 10170 "PhotoPage.c"
 	} else {
 #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = FALSE;
-#line 10192 "PhotoPage.c"
+#line 10174 "PhotoPage.c"
 	}
 #line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 10196 "PhotoPage.c"
+#line 10178 "PhotoPage.c"
 		gint last_location_x = 0;
 		gint last_location_y = 0;
 		EditingToolsEditingToolWindow* _tmp9_ = NULL;
@@ -10255,7 +10237,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 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp22_);
-#line 10254 "PhotoPage.c"
+#line 10236 "PhotoPage.c"
 	}
 #line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = tool;
@@ -10305,7 +10287,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_tmp35_ = new_pixbuf;
 #line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_ != NULL) {
-#line 10304 "PhotoPage.c"
+#line 10286 "PhotoPage.c"
 		GdkPixbuf* _tmp36_ = NULL;
 		GdkPixbuf* _tmp37_ = NULL;
 #line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10316,14 +10298,14 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		_g_object_unref0 (replacement);
 #line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		replacement = _tmp37_;
-#line 10315 "PhotoPage.c"
+#line 10297 "PhotoPage.c"
 	} else {
 		GdkPixbuf* _tmp38_ = NULL;
 #line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = self->priv->cancel_editing_pixbuf;
 #line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp38_ != NULL) {
-#line 10322 "PhotoPage.c"
+#line 10304 "PhotoPage.c"
 			GdkPixbuf* _tmp39_ = NULL;
 			GdkPixbuf* _tmp40_ = NULL;
 			GdkPixbuf* _tmp41_ = NULL;
@@ -10344,18 +10326,18 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 			*new_max_dim = _tmp42_;
 #line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = FALSE;
-#line 10343 "PhotoPage.c"
+#line 10325 "PhotoPage.c"
 		} else {
 #line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = TRUE;
-#line 10347 "PhotoPage.c"
+#line 10329 "PhotoPage.c"
 		}
 	}
 #line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = replacement;
 #line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp43_ != NULL) {
-#line 10354 "PhotoPage.c"
+#line 10336 "PhotoPage.c"
 		GdkPixbuf* _tmp44_ = NULL;
 		Dimensions _tmp45_ = {0};
 #line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10364,7 +10346,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		_tmp45_ = *new_max_dim;
 #line 1521 "/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 10345 "PhotoPage.c"
 	}
 #line 1522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cancel_editing_pixbuf);
@@ -10378,13 +10360,13 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		self->priv->pixbuf_dirty = TRUE;
 #line 1527 "/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 10359 "PhotoPage.c"
 	}
 #line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp47_ = command;
 #line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp47_ != NULL) {
-#line 10383 "PhotoPage.c"
+#line 10365 "PhotoPage.c"
 		CommandManager* _tmp48_ = NULL;
 		CommandManager* _tmp49_ = NULL;
 		Command* _tmp50_ = NULL;
@@ -10398,7 +10380,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		command_manager_execute (_tmp49_, _tmp50_);
 #line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp49_);
-#line 10397 "PhotoPage.c"
+#line 10379 "PhotoPage.c"
 	}
 #line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (replacement);
@@ -10406,7 +10388,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_g_object_unref0 (tool_window);
 #line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 10405 "PhotoPage.c"
+#line 10387 "PhotoPage.c"
 }
 
 
@@ -10418,7 +10400,7 @@ static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, G
 	result = FALSE;
 #line 1538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10417 "PhotoPage.c"
+#line 10399 "PhotoPage.c"
 }
 
 
@@ -10427,7 +10409,7 @@ gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButto
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_double_click (self, event);
-#line 10426 "PhotoPage.c"
+#line 10408 "PhotoPage.c"
 }
 
 
@@ -10461,14 +10443,14 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	_tmp1_ = _tmp0_->type;
 #line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == GDK_2BUTTON_PRESS) {
-#line 10460 "PhotoPage.c"
+#line 10442 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		EditingToolsEditingTool* _tmp3_ = NULL;
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->current_tool;
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_ == NULL) {
-#line 10467 "PhotoPage.c"
+#line 10449 "PhotoPage.c"
 			GdkEventButton* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10477,17 +10459,17 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 			_tmp5_ = editing_host_page_on_double_click (self, _tmp4_);
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = _tmp5_;
-#line 10476 "PhotoPage.c"
+#line 10458 "PhotoPage.c"
 		} else {
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = FALSE;
-#line 10480 "PhotoPage.c"
+#line 10462 "PhotoPage.c"
 		}
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = _tmp2_;
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10486 "PhotoPage.c"
+#line 10468 "PhotoPage.c"
 	}
 #line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = event;
@@ -10505,7 +10487,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	_tmp11_ = self->priv->current_tool;
 #line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 10504 "PhotoPage.c"
+#line 10486 "PhotoPage.c"
 		GtkScale* _tmp12_ = NULL;
 		gdouble _tmp13_ = 0.0;
 #line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10514,15 +10496,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 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp13_ != 0.0;
-#line 10513 "PhotoPage.c"
+#line 10495 "PhotoPage.c"
 	} else {
 #line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 10517 "PhotoPage.c"
+#line 10499 "PhotoPage.c"
 	}
 #line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 10521 "PhotoPage.c"
+#line 10503 "PhotoPage.c"
 		GdkEventButton* _tmp14_ = NULL;
 		gdouble _tmp15_ = 0.0;
 		GdkEventButton* _tmp16_ = NULL;
@@ -10547,7 +10529,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		result = TRUE;
 #line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10546 "PhotoPage.c"
+#line 10528 "PhotoPage.c"
 	}
 #line 1562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->current_tool;
@@ -10557,7 +10539,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		result = FALSE;
 #line 1563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10556 "PhotoPage.c"
+#line 10538 "PhotoPage.c"
 	}
 #line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = x;
@@ -10571,7 +10553,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		result = TRUE;
 #line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10570 "PhotoPage.c"
+#line 10552 "PhotoPage.c"
 	}
 #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
@@ -10585,7 +10567,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	result = TRUE;
 #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10584 "PhotoPage.c"
+#line 10566 "PhotoPage.c"
 }
 
 
@@ -10611,7 +10593,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 	_tmp0_ = self->priv->is_pan_in_progress;
 #line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10610 "PhotoPage.c"
+#line 10592 "PhotoPage.c"
 		GdkPoint viewport_center = {0};
 		ZoomState _tmp1_ = {0};
 		GdkPoint _tmp2_ = {0};
@@ -10698,7 +10680,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 		self->priv->is_pan_in_progress = FALSE;
 #line 1590 "/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 10679 "PhotoPage.c"
 	}
 #line 1595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = self->priv->current_tool;
@@ -10708,7 +10690,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 		result = FALSE;
 #line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10707 "PhotoPage.c"
+#line 10689 "PhotoPage.c"
 	}
 #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
@@ -10734,7 +10716,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 	_g_object_unref0 (_tmp29_);
 #line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
-#line 10733 "PhotoPage.c"
+#line 10715 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp31_ = NULL;
 		EditingToolsEditingToolWindow* _tmp32_ = NULL;
 		EditingToolsEditingToolWindow* _tmp33_ = NULL;
@@ -10748,13 +10730,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 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp33_);
-#line 10747 "PhotoPage.c"
+#line 10729 "PhotoPage.c"
 	}
 #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10753 "PhotoPage.c"
+#line 10735 "PhotoPage.c"
 }
 
 
@@ -10775,7 +10757,7 @@ static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButto
 	result = _tmp1_;
 #line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10774 "PhotoPage.c"
+#line 10756 "PhotoPage.c"
 }
 
 
@@ -10784,7 +10766,7 @@ static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self
 	result = editing_host_page_on_fetch_original ((EditingHostPage*) self);
 #line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10783 "PhotoPage.c"
+#line 10765 "PhotoPage.c"
 }
 
 
@@ -10824,7 +10806,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	if (_tmp4_) {
 #line 1612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10823 "PhotoPage.c"
+#line 10805 "PhotoPage.c"
 	}
 #line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
@@ -10842,7 +10824,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	if (_tmp8_) {
 #line 1619 "/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 10823 "PhotoPage.c"
 	}
 #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -10862,7 +10844,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	_data_collection_unref0 (_tmp13_);
 #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 10861 "PhotoPage.c"
+#line 10843 "PhotoPage.c"
 }
 
 
@@ -10871,7 +10853,7 @@ static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, "on_view_contents_ordering_altered");
-#line 10870 "PhotoPage.c"
+#line 10852 "PhotoPage.c"
 }
 
 
@@ -10884,7 +10866,7 @@ static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 1629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10883 "PhotoPage.c"
+#line 10865 "PhotoPage.c"
 		PixbufCache* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
@@ -10898,13 +10880,13 @@ static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
 		pixbuf_cache_prefetch (_tmp1_, _tmp3_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE);
 #line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 10897 "PhotoPage.c"
+#line 10879 "PhotoPage.c"
 	}
 #line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10903 "PhotoPage.c"
+#line 10885 "PhotoPage.c"
 }
 
 
@@ -10955,7 +10937,7 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
 	_tmp10_ = _tmp9_.width;
 #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ >= _tmp10_) {
-#line 10954 "PhotoPage.c"
+#line 10936 "PhotoPage.c"
 		Dimensions _tmp11_ = {0};
 		gint _tmp12_ = 0;
 		Dimensions _tmp13_ = {0};
@@ -10970,17 +10952,17 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
 		_tmp14_ = _tmp13_.height;
 #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp12_ >= _tmp14_;
-#line 10969 "PhotoPage.c"
+#line 10951 "PhotoPage.c"
 	} else {
 #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 10973 "PhotoPage.c"
+#line 10955 "PhotoPage.c"
 	}
 #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = !_tmp6_;
 #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10979 "PhotoPage.c"
+#line 10961 "PhotoPage.c"
 }
 
 
@@ -10994,11 +10976,11 @@ static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* s
 	if (_tmp0_) {
 #line 1648 "/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 10975 "PhotoPage.c"
 	} else {
 #line 1650 "/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 10979 "PhotoPage.c"
 	}
 }
 
@@ -11021,7 +11003,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	_tmp0_ = self->priv->current_tool;
 #line 1655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11020 "PhotoPage.c"
+#line 11002 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
@@ -11045,7 +11027,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 		result = TRUE;
 #line 1661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11044 "PhotoPage.c"
+#line 11026 "PhotoPage.c"
 	}
 #line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
@@ -11053,7 +11035,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	_tmp6_ = self->priv->is_pan_in_progress;
 #line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 11052 "PhotoPage.c"
+#line 11034 "PhotoPage.c"
 		gint delta_x = 0;
 		GdkEventMotion* _tmp7_ = NULL;
 		gdouble _tmp8_ = 0.0;
@@ -11127,7 +11109,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 		result = TRUE;
 #line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11126 "PhotoPage.c"
+#line 11108 "PhotoPage.c"
 	}
 #line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = event;
@@ -11143,7 +11125,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	result = _tmp28_;
 #line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11142 "PhotoPage.c"
+#line 11124 "PhotoPage.c"
 }
 
 
@@ -11158,7 +11140,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 	_tmp0_ = self->priv->current_tool;
 #line 1684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11157 "PhotoPage.c"
+#line 11139 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
 #line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11169,7 +11151,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 		result = _tmp2_;
 #line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11168 "PhotoPage.c"
+#line 11150 "PhotoPage.c"
 	}
 #line 1687 "/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 +11159,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 	result = _tmp3_;
 #line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11176 "PhotoPage.c"
+#line 11158 "PhotoPage.c"
 }
 
 
@@ -11189,7 +11171,7 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 	_tmp0_ = self->priv->current_tool;
 #line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11188 "PhotoPage.c"
+#line 11170 "PhotoPage.c"
 		EditingToolsEditingToolWindow* tool_window = NULL;
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		EditingToolsEditingToolWindow* _tmp2_ = NULL;
@@ -11205,7 +11187,7 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 		_tmp4_ = tool_window;
 #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ != NULL) {
-#line 11204 "PhotoPage.c"
+#line 11186 "PhotoPage.c"
 			EditingToolsEditingToolWindow* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11214,21 +11196,21 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 			_tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_);
 #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = !_tmp6_;
-#line 11213 "PhotoPage.c"
+#line 11195 "PhotoPage.c"
 		} else {
 #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = FALSE;
-#line 11217 "PhotoPage.c"
+#line 11199 "PhotoPage.c"
 		}
 #line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_) {
 #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_place_tool_window (self);
-#line 11223 "PhotoPage.c"
+#line 11205 "PhotoPage.c"
 		}
 #line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (tool_window);
-#line 11227 "PhotoPage.c"
+#line 11209 "PhotoPage.c"
 	}
 }
 
@@ -11246,7 +11228,7 @@ static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) {
 	_tmp0_ = *rect;
 #line 1702 "/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 11227 "PhotoPage.c"
 }
 
 
@@ -11266,7 +11248,7 @@ static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* r
 	_tmp1_ = *rect;
 #line 1708 "/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 11247 "PhotoPage.c"
 }
 
 
@@ -11305,7 +11287,7 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	static GQuark _tmp6_label10 = 0;
 #line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 11304 "PhotoPage.c"
+#line 11286 "PhotoPage.c"
 	ZoomState new_zoom_state = {0};
 	ZoomState _tmp12_ = {0};
 	GdkPoint _tmp13_ = {0};
@@ -11336,7 +11318,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 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11335 "PhotoPage.c"
+#line 11317 "PhotoPage.c"
 			default:
 			{
 				gint _tmp8_ = 0;
@@ -11346,13 +11328,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11345 "PhotoPage.c"
+#line 11327 "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 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11351 "PhotoPage.c"
+#line 11333 "PhotoPage.c"
 			default:
 			{
 				gint _tmp9_ = 0;
@@ -11362,13 +11344,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11361 "PhotoPage.c"
+#line 11343 "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 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11367 "PhotoPage.c"
+#line 11349 "PhotoPage.c"
 			default:
 			{
 				gint _tmp10_ = 0;
@@ -11378,13 +11360,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11377 "PhotoPage.c"
+#line 11359 "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 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11383 "PhotoPage.c"
+#line 11365 "PhotoPage.c"
 			default:
 			{
 				gint _tmp11_ = 0;
@@ -11394,20 +11376,20 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11393 "PhotoPage.c"
+#line 11375 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11399 "PhotoPage.c"
+#line 11381 "PhotoPage.c"
 			default:
 			{
 #line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = FALSE;
 #line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 11406 "PhotoPage.c"
+#line 11388 "PhotoPage.c"
 			}
 		}
 	}
@@ -11427,7 +11409,7 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	result = TRUE;
 #line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11426 "PhotoPage.c"
+#line 11408 "PhotoPage.c"
 }
 
 
@@ -11460,7 +11442,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	static GQuark _tmp13_label6 = 0;
 #line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label7 = 0;
-#line 11459 "PhotoPage.c"
+#line 11441 "PhotoPage.c"
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
 #line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11471,7 +11453,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	_tmp0_ = self->priv->current_tool;
 #line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11470 "PhotoPage.c"
+#line 11452 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		GdkEventKey* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
@@ -11487,14 +11469,14 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 			result = TRUE;
 #line 1755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11486 "PhotoPage.c"
+#line 11468 "PhotoPage.c"
 		}
 	}
 #line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_is_panning_possible (self);
 #line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11493 "PhotoPage.c"
+#line 11475 "PhotoPage.c"
 		GdkEventKey* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 #line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11507,7 +11489,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 			result = TRUE;
 #line 1761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11506 "PhotoPage.c"
+#line 11488 "PhotoPage.c"
 		}
 	}
 #line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11520,7 +11502,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 1768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11519 "PhotoPage.c"
+#line 11501 "PhotoPage.c"
 	}
 #line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
@@ -11538,51 +11520,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 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11537 "PhotoPage.c"
+#line 11519 "PhotoPage.c"
 			default:
 			{
 #line 1777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11542 "PhotoPage.c"
+#line 11524 "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 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11548 "PhotoPage.c"
+#line 11530 "PhotoPage.c"
 			default:
 			{
 #line 1782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
 #line 1783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11555 "PhotoPage.c"
+#line 11537 "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 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11561 "PhotoPage.c"
+#line 11543 "PhotoPage.c"
 			default:
 			{
 #line 1789 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
 #line 1790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11568 "PhotoPage.c"
+#line 11550 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11574 "PhotoPage.c"
+#line 11556 "PhotoPage.c"
 			default:
 			{
 #line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
 #line 1794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11581 "PhotoPage.c"
+#line 11563 "PhotoPage.c"
 			}
 		}
 	}
@@ -11594,11 +11576,11 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11593 "PhotoPage.c"
+#line 11575 "PhotoPage.c"
 	}
 #line 1800 "/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 11579 "PhotoPage.c"
 		GdkEventKey* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
 #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11607,17 +11589,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 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp18_;
-#line 11606 "PhotoPage.c"
+#line 11588 "PhotoPage.c"
 	} else {
 #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = TRUE;
-#line 11610 "PhotoPage.c"
+#line 11592 "PhotoPage.c"
 	}
 #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp16_;
 #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11616 "PhotoPage.c"
+#line 11598 "PhotoPage.c"
 }
 
 
@@ -11634,7 +11616,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t*
 	_tmp0_ = self->priv->current_tool;
 #line 1805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11633 "PhotoPage.c"
+#line 11615 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		EditingToolsPhotoCanvas* _tmp2_ = NULL;
 		cairo_t* _tmp3_ = NULL;
@@ -11649,7 +11631,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t*
 		_tmp4_ = *dim;
 #line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_photo_canvas_set_surface (_tmp2_, _tmp3_, &_tmp4_);
-#line 11648 "PhotoPage.c"
+#line 11630 "PhotoPage.c"
 	}
 }
 
@@ -11668,21 +11650,21 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
 	_tmp1_ = self->priv->current_tool;
 #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ != NULL) {
-#line 11667 "PhotoPage.c"
+#line 11649 "PhotoPage.c"
 		SinglePhotoPageUpdateReason _tmp2_ = 0;
 #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = reason;
 #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 11673 "PhotoPage.c"
+#line 11655 "PhotoPage.c"
 	} else {
 #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 11677 "PhotoPage.c"
+#line 11659 "PhotoPage.c"
 	}
 #line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 11681 "PhotoPage.c"
+#line 11663 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp3_ = NULL;
 		EditingToolsPhotoCanvas* _tmp4_ = NULL;
 		Dimensions _tmp5_ = {0};
@@ -11704,7 +11686,7 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
 		_g_object_unref0 (self->priv->cancel_editing_pixbuf);
 #line 1815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->cancel_editing_pixbuf = NULL;
-#line 11703 "PhotoPage.c"
+#line 11685 "PhotoPage.c"
 	}
 }
 
@@ -11715,7 +11697,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPag
 	result = NULL;
 #line 1820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11714 "PhotoPage.c"
+#line 11696 "PhotoPage.c"
 }
 
 
@@ -11724,7 +11706,7 @@ GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gin
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1819 "/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 11705 "PhotoPage.c"
 }
 
 
@@ -11734,7 +11716,7 @@ static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage*
 	result = NULL;
 #line 1824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11733 "PhotoPage.c"
+#line 11715 "PhotoPage.c"
 }
 
 
@@ -11743,7 +11725,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 1823 "/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 11724 "PhotoPage.c"
 }
 
 
@@ -11753,7 +11735,7 @@ static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage*
 	result = NULL;
 #line 1828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11752 "PhotoPage.c"
+#line 11734 "PhotoPage.c"
 }
 
 
@@ -11762,7 +11744,7 @@ GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1827 "/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 11743 "PhotoPage.c"
 }
 
 
@@ -11772,7 +11754,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPa
 	result = NULL;
 #line 1832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11771 "PhotoPage.c"
+#line 11753 "PhotoPage.c"
 }
 
 
@@ -11781,7 +11763,7 @@ GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gi
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1831 "/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 11762 "PhotoPage.c"
 }
 
 
@@ -11815,7 +11797,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp0_ = self->priv->current_tool;
 #line 1836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11814 "PhotoPage.c"
+#line 11796 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		cairo_t* _tmp2_ = NULL;
 #line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11826,27 +11808,27 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		editing_tools_editing_tool_paint (_tmp1_, _tmp2_);
 #line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11825 "PhotoPage.c"
+#line 11807 "PhotoPage.c"
 	}
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->photo_missing;
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11831 "PhotoPage.c"
+#line 11813 "PhotoPage.c"
 		gboolean _tmp5_ = FALSE;
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_has_photo (self);
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp5_;
-#line 11837 "PhotoPage.c"
+#line 11819 "PhotoPage.c"
 	} else {
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = FALSE;
-#line 11841 "PhotoPage.c"
+#line 11823 "PhotoPage.c"
 	}
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 11845 "PhotoPage.c"
+#line 11827 "PhotoPage.c"
 		cairo_t* _tmp6_ = NULL;
 		cairo_t* _tmp7_ = NULL;
 		Dimensions _tmp8_ = {0};
@@ -11918,7 +11900,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_g_object_unref0 (_tmp16_);
 #line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11917 "PhotoPage.c"
+#line 11899 "PhotoPage.c"
 	}
 #line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = ctx;
@@ -11934,7 +11916,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	if (!_tmp26_) {
 #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11933 "PhotoPage.c"
+#line 11915 "PhotoPage.c"
 	}
 #line 1857 "/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 +11930,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp29_ = trinket;
 #line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_ != NULL) {
-#line 11947 "PhotoPage.c"
+#line 11929 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp30_ = {0};
 		gint _tmp31_ = 0;
@@ -12030,7 +12012,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp52_ = ctx;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp52_);
-#line 12029 "PhotoPage.c"
+#line 12011 "PhotoPage.c"
 	}
 #line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp53_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
@@ -12042,7 +12024,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp54_ = trinket;
 #line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp54_ != NULL) {
-#line 12041 "PhotoPage.c"
+#line 12023 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp55_ = {0};
 		gint _tmp56_ = 0;
@@ -12109,7 +12091,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp72_ = ctx;
 #line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp72_);
-#line 12108 "PhotoPage.c"
+#line 12090 "PhotoPage.c"
 	}
 #line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp73_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
@@ -12121,7 +12103,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp74_ = trinket;
 #line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp74_ != NULL) {
-#line 12120 "PhotoPage.c"
+#line 12102 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp75_ = {0};
 		gint _tmp76_ = 0;
@@ -12203,7 +12185,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp97_ = ctx;
 #line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp97_);
-#line 12202 "PhotoPage.c"
+#line 12184 "PhotoPage.c"
 	}
 #line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp98_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
@@ -12215,7 +12197,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp99_ = trinket;
 #line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp99_ != NULL) {
-#line 12214 "PhotoPage.c"
+#line 12196 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp100_ = {0};
 		gint _tmp101_ = 0;
@@ -12312,11 +12294,11 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp127_ = ctx;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp127_);
-#line 12311 "PhotoPage.c"
+#line 12293 "PhotoPage.c"
 	}
 #line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 12315 "PhotoPage.c"
+#line 12297 "PhotoPage.c"
 }
 
 
@@ -12333,7 +12315,7 @@ gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* ph
 	result = !_tmp0_;
 #line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 12332 "PhotoPage.c"
+#line 12314 "PhotoPage.c"
 }
 
 
@@ -12369,7 +12351,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
 	if (!_tmp1_) {
 #line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12368 "PhotoPage.c"
+#line 12350 "PhotoPage.c"
 	}
 #line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -12401,7 +12383,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
 	_command_manager_unref0 (_tmp10_);
 #line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12400 "PhotoPage.c"
+#line 12382 "PhotoPage.c"
 }
 
 
@@ -12410,7 +12392,7 @@ void editing_host_page_on_rotate_clockwise (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1914 "/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 12391 "PhotoPage.c"
 }
 
 
@@ -12419,7 +12401,7 @@ void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1918 "/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 12400 "PhotoPage.c"
 }
 
 
@@ -12428,7 +12410,7 @@ void editing_host_page_on_flip_horizontally (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "");
-#line 12427 "PhotoPage.c"
+#line 12409 "PhotoPage.c"
 }
 
 
@@ -12437,7 +12419,7 @@ void editing_host_page_on_flip_vertically (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "");
-#line 12436 "PhotoPage.c"
+#line 12418 "PhotoPage.c"
 }
 
 
@@ -12465,7 +12447,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	if (_tmp0_) {
 #line 1931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12464 "PhotoPage.c"
+#line 12446 "PhotoPage.c"
 	}
 #line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp1_, 0, 0);
@@ -12477,7 +12459,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12476 "PhotoPage.c"
+#line 12458 "PhotoPage.c"
 	}
 #line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
@@ -12491,7 +12473,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	_g_object_unref0 (_tmp4_);
 #line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 12490 "PhotoPage.c"
+#line 12472 "PhotoPage.c"
 		AppWindow* _tmp7_ = NULL;
 		AppWindow* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
@@ -12528,7 +12510,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 		if (_tmp14_) {
 #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 12527 "PhotoPage.c"
+#line 12509 "PhotoPage.c"
 		}
 #line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = editing_host_page_get_photo (self);
@@ -12538,7 +12520,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 		photo_revert_to_master (_tmp16_, TRUE);
 #line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 12537 "PhotoPage.c"
+#line 12519 "PhotoPage.c"
 	}
 #line 1947 "/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 +12550,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	_command_manager_unref0 (_tmp22_);
 #line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12567 "PhotoPage.c"
+#line 12549 "PhotoPage.c"
 }
 
 
@@ -12606,7 +12588,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 	_g_object_unref0 (_tmp1_);
 #line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12605 "PhotoPage.c"
+#line 12587 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		LibraryPhoto* _tmp4_ = NULL;
 #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12617,19 +12599,19 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 		if (_tmp4_ == NULL) {
 #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12616 "PhotoPage.c"
+#line 12598 "PhotoPage.c"
 		}
 #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12622 "PhotoPage.c"
+#line 12604 "PhotoPage.c"
 	} else {
 #line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12628 "PhotoPage.c"
+#line 12610 "PhotoPage.c"
 	}
 #line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
@@ -12663,7 +12645,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 		_g_object_unref0 (item);
 #line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12662 "PhotoPage.c"
+#line 12644 "PhotoPage.c"
 	}
 #line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
@@ -12691,7 +12673,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
 #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12690 "PhotoPage.c"
+#line 12672 "PhotoPage.c"
 }
 
 
@@ -12729,7 +12711,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	_g_object_unref0 (_tmp1_);
 #line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12728 "PhotoPage.c"
+#line 12710 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		LibraryPhoto* _tmp4_ = NULL;
 #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12740,19 +12722,19 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 		if (_tmp4_ == NULL) {
 #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12739 "PhotoPage.c"
+#line 12721 "PhotoPage.c"
 		}
 #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12745 "PhotoPage.c"
+#line 12727 "PhotoPage.c"
 	} else {
 #line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12751 "PhotoPage.c"
+#line 12733 "PhotoPage.c"
 	}
 #line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
@@ -12786,7 +12768,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 		_g_object_unref0 (item);
 #line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12785 "PhotoPage.c"
+#line 12767 "PhotoPage.c"
 	}
 #line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
@@ -12814,7 +12796,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12813 "PhotoPage.c"
+#line 12795 "PhotoPage.c"
 }
 
 
@@ -12841,7 +12823,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 	if (!_tmp0_) {
 #line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12840 "PhotoPage.c"
+#line 12822 "PhotoPage.c"
 	}
 #line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
@@ -12869,7 +12851,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 	modify_originals = _tmp8_;
 #line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp9_) {
-#line 12868 "PhotoPage.c"
+#line 12850 "PhotoPage.c"
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		GeeList* _tmp12_ = NULL;
@@ -12924,11 +12906,11 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 		_command_manager_unref0 (_tmp21_);
 #line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 12923 "PhotoPage.c"
+#line 12905 "PhotoPage.c"
 	}
 #line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (dialog);
-#line 12927 "PhotoPage.c"
+#line 12909 "PhotoPage.c"
 }
 
 
@@ -12940,7 +12922,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 12939 "PhotoPage.c"
+#line 12921 "PhotoPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
 		SetBackgroundPhotoDialog* _tmp1_ = NULL;
 		gboolean desktop = FALSE;
@@ -12952,6 +12934,8 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 #line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = set_background_photo_dialog_new ();
 #line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_object_ref_sink (_tmp1_);
+#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		dialog = _tmp1_;
 #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = dialog;
@@ -12963,7 +12947,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 		screensaver = _tmp4_;
 #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 12962 "PhotoPage.c"
+#line 12946 "PhotoPage.c"
 			AppWindow* _tmp6_ = NULL;
 			AppWindow* _tmp7_ = NULL;
 			Photo* _tmp8_ = NULL;
@@ -13000,11 +12984,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 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp13_);
-#line 12999 "PhotoPage.c"
+#line 12983 "PhotoPage.c"
 		}
 #line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_set_background_dialog_unref0 (dialog);
-#line 13003 "PhotoPage.c"
+		_g_object_unref0 (dialog);
+#line 12987 "PhotoPage.c"
 	}
 }
 
@@ -13012,7 +12996,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 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 13011 "PhotoPage.c"
+#line 12995 "PhotoPage.c"
 }
 
 
@@ -13058,7 +13042,7 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
 	if (_tmp6_ == NULL) {
 #line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 13057 "PhotoPage.c"
+#line 13041 "PhotoPage.c"
 	}
 #line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
@@ -13068,7 +13052,7 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
 	result = _tmp8_;
 #line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13067 "PhotoPage.c"
+#line 13051 "PhotoPage.c"
 }
 
 
@@ -13114,37 +13098,37 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
 	_tmp8_ = self->priv->current_tool;
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ == NULL) {
-#line 13113 "PhotoPage.c"
+#line 13097 "PhotoPage.c"
 		gboolean _tmp9_ = FALSE;
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp9_;
-#line 13119 "PhotoPage.c"
+#line 13103 "PhotoPage.c"
 	} else {
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = FALSE;
-#line 13123 "PhotoPage.c"
+#line 13107 "PhotoPage.c"
 	}
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp7_) {
-#line 13127 "PhotoPage.c"
+#line 13111 "PhotoPage.c"
 		gboolean _tmp10_ = FALSE;
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = !_tmp10_;
-#line 13133 "PhotoPage.c"
+#line 13117 "PhotoPage.c"
 	} else {
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 13137 "PhotoPage.c"
+#line 13121 "PhotoPage.c"
 	}
 #line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
 #line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 13143 "PhotoPage.c"
+#line 13127 "PhotoPage.c"
 	}
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = event;
@@ -13154,7 +13138,7 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
 	result = _tmp12_;
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13153 "PhotoPage.c"
+#line 13137 "PhotoPage.c"
 }
 
 
@@ -13189,7 +13173,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 	_tmp3_ = _tmp2_;
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp3_) {
-#line 13188 "PhotoPage.c"
+#line 13172 "PhotoPage.c"
 		GtkToggleToolButton* _tmp4_ = NULL;
 		GtkToggleToolButton* _tmp5_ = NULL;
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13198,11 +13182,11 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 		_tmp5_ = toggle;
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_ == _tmp5_;
-#line 13197 "PhotoPage.c"
+#line 13181 "PhotoPage.c"
 	} else {
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 13201 "PhotoPage.c"
+#line 13185 "PhotoPage.c"
 	}
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	deactivating_only = _tmp0_;
@@ -13218,7 +13202,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 2050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13217 "PhotoPage.c"
+#line 13201 "PhotoPage.c"
 	}
 #line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -13262,7 +13246,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 	editing_host_page_activate_tool (self, _tmp17_);
 #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 13261 "PhotoPage.c"
+#line 13245 "PhotoPage.c"
 }
 
 
@@ -13284,7 +13268,7 @@ static void editing_host_page_on_tool_activated (EditingHostPage* self) {
 	_tmp2_ = self->priv->current_editing_toggle;
 #line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, TRUE);
-#line 13283 "PhotoPage.c"
+#line 13267 "PhotoPage.c"
 }
 
 
@@ -13306,7 +13290,7 @@ static void editing_host_page_on_tool_deactivated (EditingHostPage* self) {
 	_tmp2_ = self->priv->current_editing_toggle;
 #line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, FALSE);
-#line 13305 "PhotoPage.c"
+#line 13289 "PhotoPage.c"
 }
 
 
@@ -13333,7 +13317,7 @@ static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* c
 	_tmp3_ = needs_improvement;
 #line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, _tmp0_, _tmp1_, &_tmp2_, _tmp3_);
-#line 13332 "PhotoPage.c"
+#line 13316 "PhotoPage.c"
 }
 
 
@@ -13349,7 +13333,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 2089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 13348 "PhotoPage.c"
+#line 13332 "PhotoPage.c"
 }
 
 
@@ -13363,7 +13347,7 @@ static void editing_host_page_on_tool_aborted (EditingHostPage* self) {
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 2094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, TRUE);
-#line 13362 "PhotoPage.c"
+#line 13346 "PhotoPage.c"
 }
 
 
@@ -13381,7 +13365,7 @@ void editing_host_page_toggle_crop (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13380 "PhotoPage.c"
+#line 13364 "PhotoPage.c"
 }
 
 
@@ -13399,7 +13383,7 @@ void editing_host_page_toggle_straighten (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13398 "PhotoPage.c"
+#line 13382 "PhotoPage.c"
 }
 
 
@@ -13417,7 +13401,7 @@ void editing_host_page_toggle_redeye (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13416 "PhotoPage.c"
+#line 13400 "PhotoPage.c"
 }
 
 
@@ -13435,7 +13419,7 @@ void editing_host_page_toggle_adjust (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13434 "PhotoPage.c"
+#line 13418 "PhotoPage.c"
 }
 
 
@@ -13444,7 +13428,7 @@ static EditingToolsEditingTool* _editing_tools_straighten_tool_factory_editing_t
 	result = editing_tools_straighten_tool_factory ();
 #line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13443 "PhotoPage.c"
+#line 13427 "PhotoPage.c"
 }
 
 
@@ -13456,7 +13440,7 @@ static void editing_host_page_on_straighten_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->straighten_button;
 #line 2114 "/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 13455 "PhotoPage.c"
+#line 13439 "PhotoPage.c"
 }
 
 
@@ -13465,7 +13449,7 @@ static EditingToolsEditingTool* _editing_tools_crop_tool_factory_editing_tools_e
 	result = editing_tools_crop_tool_factory ();
 #line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13464 "PhotoPage.c"
+#line 13448 "PhotoPage.c"
 }
 
 
@@ -13477,7 +13461,7 @@ static void editing_host_page_on_crop_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->crop_button;
 #line 2118 "/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 13476 "PhotoPage.c"
+#line 13460 "PhotoPage.c"
 }
 
 
@@ -13486,7 +13470,7 @@ static EditingToolsEditingTool* _editing_tools_redeye_tool_factory_editing_tools
 	result = editing_tools_redeye_tool_factory ();
 #line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13485 "PhotoPage.c"
+#line 13469 "PhotoPage.c"
 }
 
 
@@ -13498,7 +13482,7 @@ static void editing_host_page_on_redeye_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->redeye_button;
 #line 2122 "/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 13497 "PhotoPage.c"
+#line 13481 "PhotoPage.c"
 }
 
 
@@ -13507,7 +13491,7 @@ static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools
 	result = editing_tools_adjust_tool_factory ();
 #line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13506 "PhotoPage.c"
+#line 13490 "PhotoPage.c"
 }
 
 
@@ -13519,7 +13503,7 @@ static void editing_host_page_on_adjust_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->adjust_button;
 #line 2126 "/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 13518 "PhotoPage.c"
+#line 13502 "PhotoPage.c"
 }
 
 
@@ -13536,7 +13520,7 @@ gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* p
 	result = !_tmp0_;
 #line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13535 "PhotoPage.c"
+#line 13519 "PhotoPage.c"
 }
 
 
@@ -13561,7 +13545,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	_tmp0_ = self->priv->current_tool;
 #line 2137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 13560 "PhotoPage.c"
+#line 13544 "PhotoPage.c"
 		Dimensions _tmp1_ = {0};
 #line 2138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		dimensions_init (&_tmp1_, 0, 0);
@@ -13569,7 +13553,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 		editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
 #line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 13568 "PhotoPage.c"
+#line 13552 "PhotoPage.c"
 	}
 #line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
@@ -13577,7 +13561,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 2144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13576 "PhotoPage.c"
+#line 13560 "PhotoPage.c"
 	}
 #line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->current_tool;
@@ -13589,7 +13573,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	_tmp5_ = adjust_tool;
 #line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 13588 "PhotoPage.c"
+#line 13572 "PhotoPage.c"
 		EditingToolsAdjustTool* _tmp6_ = NULL;
 #line 2148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = adjust_tool;
@@ -13599,7 +13583,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 		_editing_tools_editing_tool_unref0 (adjust_tool);
 #line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13598 "PhotoPage.c"
+#line 13582 "PhotoPage.c"
 	}
 #line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = editing_host_page_get_photo (self);
@@ -13627,7 +13611,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	_g_object_unref0 (command);
 #line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (adjust_tool);
-#line 13626 "PhotoPage.c"
+#line 13610 "PhotoPage.c"
 }
 
 
@@ -13645,7 +13629,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
 	if (!_tmp0_) {
 #line 2159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13644 "PhotoPage.c"
+#line 13628 "PhotoPage.c"
 	}
 #line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
@@ -13663,7 +13647,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
 	_g_object_unref0 (_tmp2_);
 #line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
-#line 13662 "PhotoPage.c"
+#line 13646 "PhotoPage.c"
 }
 
 
@@ -13693,14 +13677,14 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 13692 "PhotoPage.c"
+#line 13676 "PhotoPage.c"
 	} else {
 		PixelTransformationBundle* _tmp3_ = NULL;
 #line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = copied_adjustments;
 #line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 13699 "PhotoPage.c"
+#line 13683 "PhotoPage.c"
 	}
 #line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
@@ -13708,7 +13692,7 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
 #line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13707 "PhotoPage.c"
+#line 13691 "PhotoPage.c"
 	}
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (self);
@@ -13738,7 +13722,7 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 	_g_object_unref0 (command);
 #line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 13737 "PhotoPage.c"
+#line 13721 "PhotoPage.c"
 }
 
 
@@ -13793,7 +13777,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	if (_tmp0_ == NULL) {
 #line 2176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13792 "PhotoPage.c"
+#line 13776 "PhotoPage.c"
 	}
 #line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
@@ -13809,7 +13793,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		_g_object_unref0 (tool_window);
 #line 2180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13808 "PhotoPage.c"
+#line 13792 "PhotoPage.c"
 	}
 #line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = tool_window;
@@ -13843,7 +13827,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	_g_free0 (_tmp12_);
 #line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_) {
-#line 13842 "PhotoPage.c"
+#line 13826 "PhotoPage.c"
 		GeeHashMap* _tmp15_ = NULL;
 		EditingToolsEditingTool* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -13888,7 +13872,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		y = (gint) ((gintptr) _tmp26_);
 #line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp25_);
-#line 13887 "PhotoPage.c"
+#line 13871 "PhotoPage.c"
 	} else {
 		GtkWindow* _tmp27_ = NULL;
 		GtkWindow* _tmp28_ = NULL;
@@ -13911,7 +13895,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		_g_object_unref0 (_tmp28_);
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp31_) {
-#line 13910 "PhotoPage.c"
+#line 13894 "PhotoPage.c"
 			gint rx = 0;
 			gint ry = 0;
 			GtkWindow* _tmp32_ = NULL;
@@ -13986,7 +13970,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			cheight = _tmp46_;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) {
-#line 13985 "PhotoPage.c"
+#line 13969 "PhotoPage.c"
 				gint _tmp48_ = 0;
 				gint _tmp49_ = 0;
 				gint _tmp50_ = 0;
@@ -14004,7 +13988,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 				_tmp52_ = _tmp51_.width;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp47_ = ((_tmp48_ + _tmp49_) + (_tmp50_ / 2)) - (_tmp52_ / 2);
-#line 14003 "PhotoPage.c"
+#line 13987 "PhotoPage.c"
 			} else {
 				gint _tmp53_ = 0;
 				gint _tmp54_ = 0;
@@ -14017,7 +14001,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 				_tmp55_ = cwidth;
 #line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp47_ = (_tmp53_ + _tmp54_) + (_tmp55_ / 2);
-#line 14016 "PhotoPage.c"
+#line 14000 "PhotoPage.c"
 			}
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			x = _tmp47_;
@@ -14033,7 +14017,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			_tmp60_ = _tmp59_.height;
 #line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			y = ((_tmp56_ + _tmp57_) + _tmp58_) - ((_tmp60_ / 4) * 3);
-#line 14032 "PhotoPage.c"
+#line 14016 "PhotoPage.c"
 		} else {
 			GtkWindow* _tmp61_ = NULL;
 			GtkWindow* _tmp62_ = NULL;
@@ -14112,13 +14096,13 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			_tmp79_ = self->priv->current_tool;
 #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 14111 "PhotoPage.c"
+#line 14095 "PhotoPage.c"
 				gint _tmp80_ = 0;
 #line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp80_ = x;
 #line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				x = (_tmp80_ * 3) / 4;
-#line 14117 "PhotoPage.c"
+#line 14101 "PhotoPage.c"
 			} else {
 				gint _tmp81_ = 0;
 				GtkAllocation _tmp82_ = {0};
@@ -14131,11 +14115,11 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 				_tmp83_ = _tmp82_.width;
 #line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				x = (_tmp81_ - _tmp83_) / 2;
-#line 14130 "PhotoPage.c"
+#line 14114 "PhotoPage.c"
 			}
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (screen);
-#line 14134 "PhotoPage.c"
+#line 14118 "PhotoPage.c"
 		}
 	}
 #line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14200,7 +14184,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	_g_object_unref0 (screen);
 #line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (tool_window);
-#line 14199 "PhotoPage.c"
+#line 14183 "PhotoPage.c"
 }
 
 
@@ -14234,7 +14218,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	if (!_tmp1_) {
 #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14233 "PhotoPage.c"
+#line 14217 "PhotoPage.c"
 	}
 #line 2255 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -14272,7 +14256,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 		_g_object_unref0 (current_photo);
 #line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14271 "PhotoPage.c"
+#line 14255 "PhotoPage.c"
 	}
 #line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
@@ -14280,14 +14264,14 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	_tmp12_ = _g_object_ref0 (_tmp11_);
 #line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	next = _tmp12_;
-#line 14279 "PhotoPage.c"
+#line 14263 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
 #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
 #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14286 "PhotoPage.c"
+#line 14270 "PhotoPage.c"
 			ViewCollection* _tmp14_ = NULL;
 			ViewCollection* _tmp15_ = NULL;
 			DataView* _tmp16_ = NULL;
@@ -14303,7 +14287,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			Photo* _tmp25_ = NULL;
 #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14302 "PhotoPage.c"
+#line 14286 "PhotoPage.c"
 			}
 #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
@@ -14327,7 +14311,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			if (_tmp18_ == NULL) {
 #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14326 "PhotoPage.c"
+#line 14310 "PhotoPage.c"
 			}
 #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = next;
@@ -14339,7 +14323,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			if (_tmp21_ == NULL) {
 #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14338 "PhotoPage.c"
+#line 14322 "PhotoPage.c"
 			}
 #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			next_photo = _tmp21_;
@@ -14351,7 +14335,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (next_photo);
 #line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14350 "PhotoPage.c"
+#line 14334 "PhotoPage.c"
 			}
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = next_photo;
@@ -14363,7 +14347,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (next_photo);
 #line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14362 "PhotoPage.c"
+#line 14346 "PhotoPage.c"
 			}
 #line 2276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = next_photo;
@@ -14373,7 +14357,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 14372 "PhotoPage.c"
+#line 14356 "PhotoPage.c"
 		}
 	}
 #line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14382,7 +14366,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (current);
 #line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14381 "PhotoPage.c"
+#line 14365 "PhotoPage.c"
 }
 
 
@@ -14416,7 +14400,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	if (!_tmp1_) {
 #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14415 "PhotoPage.c"
+#line 14399 "PhotoPage.c"
 	}
 #line 2288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -14454,7 +14438,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 		_g_object_unref0 (current_photo);
 #line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14453 "PhotoPage.c"
+#line 14437 "PhotoPage.c"
 	}
 #line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
@@ -14462,14 +14446,14 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	_tmp12_ = _g_object_ref0 (_tmp11_);
 #line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	previous = _tmp12_;
-#line 14461 "PhotoPage.c"
+#line 14445 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
 #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
 #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14468 "PhotoPage.c"
+#line 14452 "PhotoPage.c"
 			ViewCollection* _tmp14_ = NULL;
 			ViewCollection* _tmp15_ = NULL;
 			DataView* _tmp16_ = NULL;
@@ -14485,7 +14469,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			Photo* _tmp25_ = NULL;
 #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14484 "PhotoPage.c"
+#line 14468 "PhotoPage.c"
 			}
 #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
@@ -14509,7 +14493,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			if (_tmp18_ == NULL) {
 #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14508 "PhotoPage.c"
+#line 14492 "PhotoPage.c"
 			}
 #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = previous;
@@ -14521,7 +14505,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			if (_tmp21_ == NULL) {
 #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14520 "PhotoPage.c"
+#line 14504 "PhotoPage.c"
 			}
 #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			previous_photo = _tmp21_;
@@ -14533,7 +14517,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (previous_photo);
 #line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14532 "PhotoPage.c"
+#line 14516 "PhotoPage.c"
 			}
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = previous_photo;
@@ -14545,7 +14529,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (previous_photo);
 #line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14544 "PhotoPage.c"
+#line 14528 "PhotoPage.c"
 			}
 #line 2309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = previous_photo;
@@ -14555,7 +14539,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 14554 "PhotoPage.c"
+#line 14538 "PhotoPage.c"
 		}
 	}
 #line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14564,7 +14548,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (current);
 #line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14563 "PhotoPage.c"
+#line 14547 "PhotoPage.c"
 }
 
 
@@ -14579,7 +14563,7 @@ gboolean editing_host_page_has_current_tool (EditingHostPage* self) {
 	result = _tmp0_ != NULL;
 #line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 14578 "PhotoPage.c"
+#line 14562 "PhotoPage.c"
 }
 
 
@@ -14590,7 +14574,7 @@ void editing_host_page_unset_view_collection (EditingHostPage* self) {
 	_data_collection_unref0 (self->priv->parent_view);
 #line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->parent_view = NULL;
-#line 14589 "PhotoPage.c"
+#line 14573 "PhotoPage.c"
 }
 
 
@@ -14677,14 +14661,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 14676 "PhotoPage.c"
+#line 14660 "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 14683 "PhotoPage.c"
+#line 14667 "PhotoPage.c"
 }
 
 
@@ -14697,7 +14681,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 14696 "PhotoPage.c"
+#line 14680 "PhotoPage.c"
 }
 
 
@@ -14710,14 +14694,14 @@ static void editing_host_page_editing_host_canvas_class_init (EditingHostPageEdi
 	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 14709 "PhotoPage.c"
+#line 14693 "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 14716 "PhotoPage.c"
+#line 14700 "PhotoPage.c"
 }
 
 
@@ -14729,7 +14713,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 14728 "PhotoPage.c"
+#line 14712 "PhotoPage.c"
 }
 
 
@@ -14848,7 +14832,7 @@ static void editing_host_page_class_init (EditingHostPageClass * klass) {
 	((SinglePhotoPageClass *) klass)->on_previous_photo = 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 14847 "PhotoPage.c"
+#line 14831 "PhotoPage.c"
 }
 
 
@@ -14916,7 +14900,7 @@ static void editing_host_page_instance_init (EditingHostPage * self) {
 	_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);
 #line 415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->last_locations = _tmp2_;
-#line 14915 "PhotoPage.c"
+#line 14899 "PhotoPage.c"
 }
 
 
@@ -15000,7 +14984,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 14999 "PhotoPage.c"
+#line 14983 "PhotoPage.c"
 }
 
 
@@ -15019,378 +15003,378 @@ 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 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_destroyed ((LibraryPhotoPage*) self, source);
-#line 15018 "PhotoPage.c"
+#line 15002 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_metadata_altered ((LibraryPhotoPage*) self, items);
-#line 15025 "PhotoPage.c"
+#line 15009 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) {
 #line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_app_changed ((LibraryPhotoPage*) self);
-#line 15032 "PhotoPage.c"
+#line 15016 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_export ((LibraryPhotoPage*) self);
-#line 15039 "PhotoPage.c"
+#line 15023 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_print ((LibraryPhotoPage*) self);
-#line 15046 "PhotoPage.c"
+#line 15030 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_publish ((LibraryPhotoPage*) self);
-#line 15053 "PhotoPage.c"
+#line 15037 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_remove_from_library ((LibraryPhotoPage*) self);
-#line 15060 "PhotoPage.c"
+#line 15044 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_move_to_trash ((LibraryPhotoPage*) self);
-#line 15067 "PhotoPage.c"
+#line 15051 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 15074 "PhotoPage.c"
+#line 15058 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 15081 "PhotoPage.c"
+#line 15065 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 15088 "PhotoPage.c"
+#line 15072 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 15095 "PhotoPage.c"
+#line 15079 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_horizontally ((EditingHostPage*) self);
-#line 15102 "PhotoPage.c"
+#line 15086 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_vertically ((EditingHostPage*) self);
-#line 15109 "PhotoPage.c"
+#line 15093 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 15116 "PhotoPage.c"
+#line 15100 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_copy_adjustments ((EditingHostPage*) self);
-#line 15123 "PhotoPage.c"
+#line 15107 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_paste_adjustments ((EditingHostPage*) self);
-#line 15130 "PhotoPage.c"
+#line 15114 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_crop ((EditingHostPage*) self);
-#line 15137 "PhotoPage.c"
+#line 15121 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_straighten ((EditingHostPage*) self);
-#line 15144 "PhotoPage.c"
+#line 15128 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_redeye ((EditingHostPage*) self);
-#line 15151 "PhotoPage.c"
+#line 15135 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_adjust ((EditingHostPage*) self);
-#line 15158 "PhotoPage.c"
+#line 15142 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_revert ((EditingHostPage*) self);
-#line 15165 "PhotoPage.c"
+#line 15149 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_title ((EditingHostPage*) self);
-#line 15172 "PhotoPage.c"
+#line 15156 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_comment ((EditingHostPage*) self);
-#line 15179 "PhotoPage.c"
+#line 15163 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_date_time ((EditingHostPage*) self);
-#line 15186 "PhotoPage.c"
+#line 15170 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit ((LibraryPhotoPage*) self);
-#line 15193 "PhotoPage.c"
+#line 15177 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit_raw ((LibraryPhotoPage*) self);
-#line 15200 "PhotoPage.c"
+#line 15184 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_send_to ((LibraryPhotoPage*) self);
-#line 15207 "PhotoPage.c"
+#line 15191 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_set_background ((EditingHostPage*) self);
-#line 15214 "PhotoPage.c"
+#line 15198 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_flag_unflag ((LibraryPhotoPage*) self);
-#line 15221 "PhotoPage.c"
+#line 15205 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_increase_rating ((LibraryPhotoPage*) self);
-#line 15228 "PhotoPage.c"
+#line 15212 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_decrease_rating ((LibraryPhotoPage*) self);
-#line 15235 "PhotoPage.c"
+#line 15219 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_rejected ((LibraryPhotoPage*) self);
-#line 15242 "PhotoPage.c"
+#line 15226 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_unrated ((LibraryPhotoPage*) self);
-#line 15249 "PhotoPage.c"
+#line 15233 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_one ((LibraryPhotoPage*) self);
-#line 15256 "PhotoPage.c"
+#line 15240 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_two ((LibraryPhotoPage*) self);
-#line 15263 "PhotoPage.c"
+#line 15247 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_three ((LibraryPhotoPage*) self);
-#line 15270 "PhotoPage.c"
+#line 15254 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_four ((LibraryPhotoPage*) self);
-#line 15277 "PhotoPage.c"
+#line 15261 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_five ((LibraryPhotoPage*) self);
-#line 15284 "PhotoPage.c"
+#line 15268 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_increase_size ((EditingHostPage*) self);
-#line 15291 "PhotoPage.c"
+#line 15275 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_decrease_size ((EditingHostPage*) self);
-#line 15298 "PhotoPage.c"
+#line 15282 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
-#line 15305 "PhotoPage.c"
+#line 15289 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
-#line 15312 "PhotoPage.c"
+#line 15296 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
-#line 15319 "PhotoPage.c"
+#line 15303 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_add_tags ((LibraryPhotoPage*) self);
-#line 15326 "PhotoPage.c"
+#line 15310 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_modify_tags ((LibraryPhotoPage*) self);
-#line 15333 "PhotoPage.c"
+#line 15317 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_slideshow ((LibraryPhotoPage*) self);
-#line 15340 "PhotoPage.c"
+#line 15324 "PhotoPage.c"
 }
 
 
 static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_on_action_toggle ((Page*) self, action, parameter);
-#line 15347 "PhotoPage.c"
+#line 15331 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_display_ratings ((LibraryPhotoPage*) self, action, value);
-#line 15354 "PhotoPage.c"
+#line 15338 "PhotoPage.c"
 }
 
 
 static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_on_action_radio ((Page*) self, action, parameter);
-#line 15361 "PhotoPage.c"
+#line 15345 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_raw_developer_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, action, value);
-#line 15368 "PhotoPage.c"
+#line 15352 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photos_altered ((LibraryPhotoPage*) self);
-#line 15375 "PhotoPage.c"
+#line 15359 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) {
 #line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_unlinking ((LibraryPhotoPage*) self, unlinking);
-#line 15382 "PhotoPage.c"
+#line 15366 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) {
 #line 2356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_relinked ((LibraryPhotoPage*) self, relinked);
-#line 15389 "PhotoPage.c"
+#line 15373 "PhotoPage.c"
 }
 
 
@@ -15456,14 +15440,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 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 15455 "PhotoPage.c"
+#line 15439 "PhotoPage.c"
 }
 
 
 LibraryPhotoPage* library_photo_page_new (void) {
 #line 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return library_photo_page_construct (TYPE_LIBRARY_PHOTO_PAGE);
-#line 15462 "PhotoPage.c"
+#line 15446 "PhotoPage.c"
 }
 
 
@@ -15494,7 +15478,7 @@ gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, Dat
 	result = _tmp4_;
 #line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15493 "PhotoPage.c"
+#line 15477 "PhotoPage.c"
 }
 
 
@@ -15508,7 +15492,7 @@ static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCo
 	_tmp0_ = self->priv->filter;
 #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 15507 "PhotoPage.c"
+#line 15491 "PhotoPage.c"
 }
 
 
@@ -15522,7 +15506,7 @@ static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCol
 	_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 15521 "PhotoPage.c"
+#line 15505 "PhotoPage.c"
 }
 
 
@@ -15547,21 +15531,21 @@ static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeLi
 	_tmp2_ = ui_filenames;
 #line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui");
-#line 15546 "PhotoPage.c"
+#line 15530 "PhotoPage.c"
 }
 
 
-static GVariant* _variant_new12 (gboolean value) {
+static GVariant* _variant_new16 (gboolean value) {
 #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 15553 "PhotoPage.c"
+#line 15537 "PhotoPage.c"
 }
 
 
-static GVariant* _variant_new13 (const gchar* value) {
+static GVariant* _variant_new17 (const gchar* value) {
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 15560 "PhotoPage.c"
+#line 15544 "PhotoPage.c"
 }
 
 
@@ -15608,7 +15592,7 @@ static void library_photo_page_real_add_actions (Page* base) {
 	if (_tmp3_ == NULL) {
 #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 15607 "PhotoPage.c"
+#line 15591 "PhotoPage.c"
 	}
 #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
@@ -15619,9 +15603,9 @@ static void library_photo_page_real_add_actions (Page* base) {
 #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _variant_new12 (_tmp7_);
+	_tmp8_ = _variant_new16 (_tmp7_);
 #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_simple_action_set_state (_tmp4_, _tmp8_);
+	g_signal_emit_by_name (_tmp4_, "change-state", _tmp8_);
 #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_variant_unref0 (_tmp8_);
 #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15648,7 +15632,7 @@ static void library_photo_page_real_add_actions (Page* base) {
 	if (_tmp14_ == NULL) {
 #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 15647 "PhotoPage.c"
+#line 15631 "PhotoPage.c"
 	}
 #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	action = _tmp14_;
@@ -15657,31 +15641,31 @@ static void library_photo_page_real_add_actions (Page* base) {
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_ == RAW_DEVELOPER_SHOTWELL) {
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = "'Shotwell'";
-#line 15657 "PhotoPage.c"
+		_tmp15_ = "Shotwell";
+#line 15641 "PhotoPage.c"
 	} else {
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = "'Camera'";
-#line 15661 "PhotoPage.c"
+		_tmp15_ = "Camera";
+#line 15645 "PhotoPage.c"
 	}
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = action;
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = _variant_new13 (_tmp15_);
+	_tmp18_ = _variant_new17 (_tmp15_);
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_simple_action_set_state (_tmp17_, _tmp18_);
+	g_signal_emit_by_name (_tmp17_, "change-state", _tmp18_);
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_variant_unref0 (_tmp18_);
 #line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15673 "PhotoPage.c"
+#line 15657 "PhotoPage.c"
 }
 
 
 static gpointer _injection_group_ref0 (gpointer self) {
 #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 15680 "PhotoPage.c"
+#line 15664 "PhotoPage.c"
 }
 
 
@@ -15692,13 +15676,13 @@ static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15691 "PhotoPage.c"
+#line 15675 "PhotoPage.c"
 	}
 #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15697 "PhotoPage.c"
+#line 15681 "PhotoPage.c"
 }
 
 
@@ -15709,13 +15693,13 @@ static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15708 "PhotoPage.c"
+#line 15692 "PhotoPage.c"
 	}
 #line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15714 "PhotoPage.c"
+#line 15698 "PhotoPage.c"
 }
 
 
@@ -15726,13 +15710,13 @@ static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15725 "PhotoPage.c"
+#line 15709 "PhotoPage.c"
 	}
 #line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15731 "PhotoPage.c"
+#line 15715 "PhotoPage.c"
 }
 
 
@@ -15813,7 +15797,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 #line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = _ ("Set as _Desktop Background");
 #line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	injection_group_add_menu_item (bg_group, _tmp11_, "SetBackground", NULL);
+	injection_group_add_menu_item (bg_group, _tmp11_, "SetBackground", "<Primary>b");
 #line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = groups;
 #line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15830,7 +15814,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 	if (result_length1) {
 #line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*result_length1 = _tmp14__length1;
-#line 15829 "PhotoPage.c"
+#line 15813 "PhotoPage.c"
 	}
 #line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp14_;
@@ -15842,7 +15826,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 	_injection_group_unref0 (print_group);
 #line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15841 "PhotoPage.c"
+#line 15825 "PhotoPage.c"
 }
 
 
@@ -15880,7 +15864,7 @@ static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimp
 	_tmp5_ = value;
 #line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 15879 "PhotoPage.c"
+#line 15863 "PhotoPage.c"
 }
 
 
@@ -15899,7 +15883,7 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 	if (_tmp1_ == NULL) {
 #line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 15898 "PhotoPage.c"
+#line 15882 "PhotoPage.c"
 	}
 #line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	action = _tmp1_;
@@ -15907,7 +15891,7 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 	_tmp2_ = action;
 #line 2480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 15906 "PhotoPage.c"
+#line 15890 "PhotoPage.c"
 		GSimpleAction* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
 #line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15916,11 +15900,11 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 		_tmp4_ = display;
 #line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_simple_action_set_enabled (_tmp3_, _tmp4_);
-#line 15915 "PhotoPage.c"
+#line 15899 "PhotoPage.c"
 	}
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15919 "PhotoPage.c"
+#line 15903 "PhotoPage.c"
 }
 
 
@@ -15976,7 +15960,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 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 15975 "PhotoPage.c"
+#line 15959 "PhotoPage.c"
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
@@ -15990,11 +15974,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_tmp4_ = _tmp8_;
 #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 15989 "PhotoPage.c"
+#line 15973 "PhotoPage.c"
 	} else {
 #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 15993 "PhotoPage.c"
+#line 15977 "PhotoPage.c"
 	}
 #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	rotate_possible = _tmp4_;
@@ -16002,7 +15986,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 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 16001 "PhotoPage.c"
+#line 15985 "PhotoPage.c"
 		Photo* _tmp11_ = NULL;
 		Photo* _tmp12_ = NULL;
 		PhotoFileFormat _tmp13_ = 0;
@@ -16016,11 +16000,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_tmp9_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
 #line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 16015 "PhotoPage.c"
+#line 15999 "PhotoPage.c"
 	} else {
 #line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = FALSE;
-#line 16019 "PhotoPage.c"
+#line 16003 "PhotoPage.c"
 	}
 #line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	is_raw = _tmp9_;
@@ -16028,7 +16012,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 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
-#line 16027 "PhotoPage.c"
+#line 16011 "PhotoPage.c"
 		ConfigFacade* _tmp16_ = NULL;
 		ConfigFacade* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
@@ -16047,11 +16031,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_g_free0 (_tmp19_);
 #line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 16046 "PhotoPage.c"
+#line 16030 "PhotoPage.c"
 	} else {
 #line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 16050 "PhotoPage.c"
+#line 16034 "PhotoPage.c"
 	}
 #line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp14_);
@@ -16059,7 +16043,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 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 16058 "PhotoPage.c"
+#line 16042 "PhotoPage.c"
 		gboolean _tmp22_ = FALSE;
 		Photo* _tmp23_ = NULL;
 		Photo* _tmp24_ = NULL;
@@ -16079,7 +16063,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		if (_tmp26_) {
 #line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = TRUE;
-#line 16078 "PhotoPage.c"
+#line 16062 "PhotoPage.c"
 		} else {
 			Photo* _tmp27_ = NULL;
 			Photo* _tmp28_ = NULL;
@@ -16094,15 +16078,15 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 			_tmp22_ = _tmp29_;
 #line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp28_);
-#line 16093 "PhotoPage.c"
+#line 16077 "PhotoPage.c"
 		}
 #line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp22_;
-#line 16097 "PhotoPage.c"
+#line 16081 "PhotoPage.c"
 	} else {
 #line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 16101 "PhotoPage.c"
+#line 16085 "PhotoPage.c"
 	}
 #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_);
@@ -16110,17 +16094,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 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp31_) {
-#line 16109 "PhotoPage.c"
+#line 16093 "PhotoPage.c"
 		gboolean _tmp32_ = FALSE;
 #line 2495 "/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 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = !_tmp32_;
-#line 16115 "PhotoPage.c"
+#line 16099 "PhotoPage.c"
 	} else {
 #line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = FALSE;
-#line 16119 "PhotoPage.c"
+#line 16103 "PhotoPage.c"
 	}
 #line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
@@ -16128,7 +16112,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		library_photo_page_update_rating_menu_item_sensitivity (self);
 #line 2497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_development_menu_item_sensitivity (self);
-#line 16127 "PhotoPage.c"
+#line 16111 "PhotoPage.c"
 	}
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp33_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -16138,7 +16122,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 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_) {
-#line 16137 "PhotoPage.c"
+#line 16121 "PhotoPage.c"
 		Photo* _tmp36_ = NULL;
 		Photo* _tmp37_ = NULL;
 		gboolean _tmp38_ = FALSE;
@@ -16152,11 +16136,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_tmp34_ = _tmp38_;
 #line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp37_);
-#line 16151 "PhotoPage.c"
+#line 16135 "PhotoPage.c"
 	} else {
 #line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = FALSE;
-#line 16155 "PhotoPage.c"
+#line 16139 "PhotoPage.c"
 	}
 #line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp34_);
@@ -16192,7 +16176,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 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_) {
-#line 16191 "PhotoPage.c"
+#line 16175 "PhotoPage.c"
 		Photo* _tmp47_ = NULL;
 		Photo* _tmp48_ = NULL;
 		Scaling _tmp49_ = {0};
@@ -16225,7 +16209,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 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp52_);
-#line 16224 "PhotoPage.c"
+#line 16208 "PhotoPage.c"
 	}
 #line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
@@ -16233,7 +16217,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp56_ = is_raw;
 #line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp56_) {
-#line 16232 "PhotoPage.c"
+#line 16216 "PhotoPage.c"
 		ConfigFacade* _tmp57_ = NULL;
 		ConfigFacade* _tmp58_ = NULL;
 		gchar* _tmp59_ = NULL;
@@ -16252,11 +16236,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_g_free0 (_tmp60_);
 #line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp58_);
-#line 16251 "PhotoPage.c"
+#line 16235 "PhotoPage.c"
 	} else {
 #line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = FALSE;
-#line 16255 "PhotoPage.c"
+#line 16239 "PhotoPage.c"
 	}
 #line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_);
@@ -16266,7 +16250,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp62_ = count;
 #line 2523 "/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 16265 "PhotoPage.c"
+#line 16249 "PhotoPage.c"
 }
 
 
@@ -16279,7 +16263,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 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 16278 "PhotoPage.c"
+#line 16262 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
@@ -16299,7 +16283,7 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 		if (_tmp6_) {
 #line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = TRUE;
-#line 16298 "PhotoPage.c"
+#line 16282 "PhotoPage.c"
 		} else {
 			Photo* _tmp7_ = NULL;
 			Photo* _tmp8_ = NULL;
@@ -16314,21 +16298,21 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 			_tmp2_ = _tmp9_;
 #line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp8_);
-#line 16313 "PhotoPage.c"
+#line 16297 "PhotoPage.c"
 		}
 #line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 16317 "PhotoPage.c"
+#line 16301 "PhotoPage.c"
 	} else {
 #line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 16321 "PhotoPage.c"
+#line 16305 "PhotoPage.c"
 	}
 #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp0_);
 #line 2529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
-#line 16327 "PhotoPage.c"
+#line 16311 "PhotoPage.c"
 }
 
 
@@ -16342,7 +16326,7 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
 	static GQuark _tmp3_label0 = 0;
 #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp3_label1 = 0;
-#line 16341 "PhotoPage.c"
+#line 16325 "PhotoPage.c"
 	RawDeveloper _tmp5_ = 0;
 	GSimpleAction* _tmp6_ = NULL;
 	GVariant* _tmp7_ = NULL;
@@ -16364,38 +16348,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 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16363 "PhotoPage.c"
+#line 16347 "PhotoPage.c"
 			default:
 			{
 #line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_SHOTWELL;
 #line 2539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16370 "PhotoPage.c"
+#line 16354 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) {
 #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16376 "PhotoPage.c"
+#line 16360 "PhotoPage.c"
 			default:
 			{
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_CAMERA;
 #line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16383 "PhotoPage.c"
+#line 16367 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16389 "PhotoPage.c"
+#line 16373 "PhotoPage.c"
 			default:
 			{
 #line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16394 "PhotoPage.c"
+#line 16378 "PhotoPage.c"
 			}
 		}
 	}
@@ -16409,7 +16393,7 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
 	_tmp7_ = value;
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_state (_tmp6_, _tmp7_);
-#line 16408 "PhotoPage.c"
+#line 16392 "PhotoPage.c"
 }
 
 
@@ -16447,7 +16431,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	if (_tmp3_) {
 #line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16446 "PhotoPage.c"
+#line 16430 "PhotoPage.c"
 	}
 #line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -16469,7 +16453,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	if (_tmp11_ == NULL) {
 #line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 16468 "PhotoPage.c"
+#line 16452 "PhotoPage.c"
 	}
 #line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
@@ -16487,7 +16471,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	if (_tmp14_ == NULL) {
 #line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
-#line 16486 "PhotoPage.c"
+#line 16470 "PhotoPage.c"
 	} else {
 		RawDeveloper _tmp15_ = 0;
 		Photo* _tmp16_ = NULL;
@@ -16503,7 +16487,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 		_tmp18_ = raw_developer_is_equivalent (_tmp15_, _tmp17_);
 #line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = _tmp18_;
-#line 16502 "PhotoPage.c"
+#line 16486 "PhotoPage.c"
 	}
 #line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_) {
@@ -16511,7 +16495,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 		_g_object_unref0 (photo);
 #line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16510 "PhotoPage.c"
+#line 16494 "PhotoPage.c"
 	}
 #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = photo;
@@ -16521,18 +16505,18 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	if (!_tmp21_) {
 #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = TRUE;
-#line 16520 "PhotoPage.c"
+#line 16504 "PhotoPage.c"
 	} else {
 		gboolean _tmp22_ = FALSE;
 #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = dialogs_confirm_warn_developer_changed (1);
 #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp22_;
-#line 16527 "PhotoPage.c"
+#line 16511 "PhotoPage.c"
 	}
 #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 16531 "PhotoPage.c"
+#line 16515 "PhotoPage.c"
 		SetRawDeveloperCommand* command = NULL;
 		ViewCollection* _tmp23_ = NULL;
 		ViewCollection* _tmp24_ = NULL;
@@ -16578,11 +16562,11 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 		library_photo_page_update_development_menu_item_sensitivity (self);
 #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 16577 "PhotoPage.c"
+#line 16561 "PhotoPage.c"
 	}
 #line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 16581 "PhotoPage.c"
+#line 16565 "PhotoPage.c"
 }
 
 
@@ -16591,7 +16575,7 @@ void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	LIBRARY_PHOTO_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 16590 "PhotoPage.c"
+#line 16574 "PhotoPage.c"
 }
 
 
@@ -16602,50 +16586,15 @@ static void library_photo_page_update_flag_action (LibraryPhotoPage* self) {
 #line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp0_) {
-#line 16602 "PhotoPage.c"
-		GSimpleAction* action = NULL;
-		GAction* _tmp1_ = NULL;
-		GSimpleAction* _tmp2_ = NULL;
-		GSimpleAction* _tmp3_ = NULL;
-		GSimpleAction* _tmp4_ = NULL;
-#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
-#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp2_ == NULL) {
-#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp1_);
-#line 16616 "PhotoPage.c"
-		}
-#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		action = _tmp2_;
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = action;
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_vala_assert (_tmp3_ != NULL, "action != null");
-#line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_debug ("PhotoPage.vala:2578: Setting label of action flagged");
-#line 2580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = action;
-#line 2580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_simple_action_set_enabled (_tmp4_, TRUE);
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (action);
-#line 16632 "PhotoPage.c"
-	} else {
-#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", FALSE);
-#line 16636 "PhotoPage.c"
-	}
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_);
+#line 16586 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_page_destroyed ((LibraryPhotoPage*) self);
-#line 16644 "PhotoPage.c"
+#line 16593 "PhotoPage.c"
 }
 
 
@@ -16656,75 +16605,75 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 	ViewCollection* _tmp3_ = NULL;
 	ViewCollection* _tmp4_ = NULL;
 	Photo* _tmp9_ = NULL;
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (return_page));
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((view == NULL) || IS_VIEW_COLLECTION (view));
-#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = return_page;
-#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->return_page);
-#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_page = _tmp1_;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = return_page;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _library_photo_page_on_page_destroyed_gtk_widget_destroy, self, 0);
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = view;
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 16679 "PhotoPage.c"
+#line 16628 "PhotoPage.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = view;
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _data_collection_ref0 (_tmp5_);
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp6_;
-#line 16690 "PhotoPage.c"
+#line 16639 "PhotoPage.c"
 	} else {
 		CollectionPage* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = return_page;
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page));
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp8_;
-#line 16702 "PhotoPage.c"
+#line 16651 "PhotoPage.c"
 	}
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = photo;
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_display_copy_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp9_);
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 16710 "PhotoPage.c"
+#line 16659 "PhotoPage.c"
 }
 
 
 void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) {
-#line 2598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->return_page);
-#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_page = NULL;
-#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2591 "/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 16723 "PhotoPage.c"
+#line 16672 "PhotoPage.c"
 }
 
 
@@ -16732,17 +16681,17 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self)
 	CollectionPage* result = NULL;
 	CollectionPage* _tmp0_ = NULL;
 	CollectionPage* _tmp1_ = NULL;
-#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
-#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_page;
-#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16741 "PhotoPage.c"
+#line 16690 "PhotoPage.c"
 }
 
 
@@ -16753,33 +16702,33 @@ static void library_photo_page_real_switched_to (Page* base) {
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp1_ != NULL, "get_photo() != null");
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page));
-#line 2617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_set_display_ratings (self, _tmp4_);
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 16778 "PhotoPage.c"
+#line 16727 "PhotoPage.c"
 }
 
 
@@ -16794,58 +16743,58 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 	gint _tmp8_ = 0;
 	GdkPixbuf* _tmp9_ = NULL;
 	GdkPixbuf* _tmp10_ = NULL;
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16801 "PhotoPage.c"
+#line 16750 "PhotoPage.c"
 	} else {
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 16816 "PhotoPage.c"
+#line 16765 "PhotoPage.c"
 	}
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16824 "PhotoPage.c"
+#line 16773 "PhotoPage.c"
 	}
-#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = scale;
-#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = resources_get_rating_trinket (_tmp7_, _tmp8_);
-#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp10_;
-#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16844 "PhotoPage.c"
+#line 16793 "PhotoPage.c"
 }
 
 
@@ -16855,46 +16804,46 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GdkPixbuf* _tmp5_ = NULL;
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16862 "PhotoPage.c"
+#line 16811 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
 		LibraryPhoto* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FLAGGABLE, Flaggable));
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 16877 "PhotoPage.c"
+#line 16826 "PhotoPage.c"
 	}
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
-#line 2632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16885 "PhotoPage.c"
+#line 16834 "PhotoPage.c"
 	}
-#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
-#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp5_;
-#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16893 "PhotoPage.c"
+#line 16842 "PhotoPage.c"
 }
 
 
@@ -16910,51 +16859,51 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
 	LibraryPhoto* _tmp7_ = NULL;
 	SlideshowPage* _tmp8_ = NULL;
 	SlideshowPage* _tmp9_ = NULL;
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16923 "PhotoPage.c"
+#line 16872 "PhotoPage.c"
 	}
-#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = library_photo_global;
-#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = slideshow_page_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo));
-#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp8_);
-#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	app_window_go_fullscreen (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PAGE, Page));
-#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 16953 "PhotoPage.c"
+#line 16902 "PhotoPage.c"
 }
 
 
@@ -16965,73 +16914,73 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa
 	gboolean _tmp4_ = FALSE;
 	ZoomState _tmp5_ = {0};
 	gboolean _tmp6_ = FALSE;
-#line 2646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 16972 "PhotoPage.c"
+#line 16921 "PhotoPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2636 "/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 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 16978 "PhotoPage.c"
+#line 16927 "PhotoPage.c"
 	} else {
-#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 16982 "PhotoPage.c"
+#line 16931 "PhotoPage.c"
 	}
-#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = zoom_state_is_default (&_tmp5_);
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp6_) {
-#line 16992 "PhotoPage.c"
+#line 16941 "PhotoPage.c"
 		gboolean _tmp7_ = FALSE;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/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 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = !_tmp7_;
-#line 16998 "PhotoPage.c"
+#line 16947 "PhotoPage.c"
 	} else {
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 17002 "PhotoPage.c"
+#line 16951 "PhotoPage.c"
 	}
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 17006 "PhotoPage.c"
+#line 16955 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_on_increase_size (EditingHostPage* base) {
 	LibraryPhotoPage * self;
-#line 2651 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17018 "PhotoPage.c"
+#line 16967 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_on_decrease_size (EditingHostPage* base) {
 	LibraryPhotoPage * self;
-#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17030 "PhotoPage.c"
+#line 16979 "PhotoPage.c"
 }
 
 
@@ -17043,43 +16992,43 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag
 	GdkEventKey* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	const gchar* _tmp4_ = NULL;
-#line 2663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_zoom_slider_key_press (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp0_);
-#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17056 "PhotoPage.c"
+#line 17005 "PhotoPage.c"
 	}
-#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
-#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (g_strcmp0 (_tmp4_, "Escape") == 0) {
-#line 2668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_return_to_collection (self);
-#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17072 "PhotoPage.c"
+#line 17021 "PhotoPage.c"
 	} else {
-#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17078 "PhotoPage.c"
+#line 17027 "PhotoPage.c"
 	}
 }
 
@@ -17089,77 +17038,77 @@ static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean m
 	gboolean sensitivity = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
-#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	sensitivity = !_tmp0_;
-#line 2678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", sensitivity);
-#line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", sensitivity);
-#line 2680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", sensitivity);
-#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToFile", sensitivity);
-#line 2683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonUndo", sensitivity);
-#line 2684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonRedo", sensitivity);
-#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", sensitivity);
-#line 2687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", sensitivity);
-#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit", sensitivity);
-#line 2689 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100", sensitivity);
-#line 2690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom200", sensitivity);
-#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", sensitivity);
-#line 2693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", sensitivity);
-#line 2694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", sensitivity);
-#line 2695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", sensitivity);
-#line 2696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", sensitivity);
-#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", sensitivity);
-#line 2698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", sensitivity);
-#line 2699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", sensitivity);
-#line 2700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2689 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", sensitivity);
-#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditTitle", sensitivity);
-#line 2702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", sensitivity);
-#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", sensitivity);
-#line 2704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", sensitivity);
-#line 2705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", sensitivity);
-#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", sensitivity);
-#line 2708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", sensitivity);
-#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", sensitivity);
-#line 2710 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", sensitivity);
-#line 2712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", sensitivity);
-#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = missing;
-#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2703 "/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 17158 "PhotoPage.c"
+#line 17107 "PhotoPage.c"
 }
 
 
@@ -17168,36 +17117,36 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag
 	gboolean _tmp0_ = FALSE;
 	Photo* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 2718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
-#line 2718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 17175 "PhotoPage.c"
+#line 17124 "PhotoPage.c"
 		Photo* _tmp1_ = NULL;
-#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = photo;
-#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2708 "/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 17181 "PhotoPage.c"
+#line 17130 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
-#line 2721 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2710 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo;
-#line 2721 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2710 "/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 17188 "PhotoPage.c"
+#line 17137 "PhotoPage.c"
 	}
-#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo;
-#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = missing;
-#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2712 "/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 17196 "PhotoPage.c"
+#line 17145 "PhotoPage.c"
 }
 
 
@@ -17211,300 +17160,300 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	GQuark _tmp8_ = 0U;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label0 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label1 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label2 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label3 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label4 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label5 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label6 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label7 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label8 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label9 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label10 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label11 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label12 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label13 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label14 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label15 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label16 = 0;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label17 = 0;
-#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event != NULL) {
-#line 17252 "PhotoPage.c"
+#line 17201 "PhotoPage.c"
 		GdkEventKey* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = event;
-#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ == TRUE;
-#line 17261 "PhotoPage.c"
+#line 17210 "PhotoPage.c"
 	} else {
-#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 17265 "PhotoPage.c"
+#line 17214 "PhotoPage.c"
 	}
-#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17273 "PhotoPage.c"
+#line 17222 "PhotoPage.c"
 	}
-#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = event;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_->keyval;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = gdk_keyval_name (_tmp4_);
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_);
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	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 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17291 "PhotoPage.c"
+#line 17240 "PhotoPage.c"
 			default:
 			{
 				GtkWindow* _tmp9_ = NULL;
 				GtkWindow* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp9_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = _tmp9_;
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp11_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_FULLSCREEN_WINDOW);
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp10_);
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (_tmp11_) {
-#line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					library_photo_page_return_to_collection (self);
-#line 17309 "PhotoPage.c"
+#line 17258 "PhotoPage.c"
 				}
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17313 "PhotoPage.c"
+#line 17262 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Delete")))) {
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17319 "PhotoPage.c"
+#line 17268 "PhotoPage.c"
 			default:
 			{
-#line 2743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash");
-#line 2744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17326 "PhotoPage.c"
+#line 17275 "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 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17332 "PhotoPage.c"
+#line 17281 "PhotoPage.c"
 			default:
 			{
-#line 2748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
-#line 2749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17339 "PhotoPage.c"
+#line 17288 "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 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17345 "PhotoPage.c"
+#line 17294 "PhotoPage.c"
 			default:
 			{
-#line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
-#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17352 "PhotoPage.c"
+#line 17301 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("KP_1")))) {
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17358 "PhotoPage.c"
+#line 17307 "PhotoPage.c"
 			default:
 			{
-#line 2757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
-#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17365 "PhotoPage.c"
+#line 17314 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("KP_2")))) {
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17371 "PhotoPage.c"
+#line 17320 "PhotoPage.c"
 			default:
 			{
-#line 2761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
-#line 2762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17378 "PhotoPage.c"
+#line 17327 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label10) ? _tmp7_label10 : (_tmp7_label10 = g_quark_from_static_string ("KP_3")))) {
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17384 "PhotoPage.c"
+#line 17333 "PhotoPage.c"
 			default:
 			{
-#line 2765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
-#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17391 "PhotoPage.c"
+#line 17340 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label11) ? _tmp7_label11 : (_tmp7_label11 = g_quark_from_static_string ("KP_4")))) {
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17397 "PhotoPage.c"
+#line 17346 "PhotoPage.c"
 			default:
 			{
-#line 2769 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
-#line 2770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17404 "PhotoPage.c"
+#line 17353 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label12) ? _tmp7_label12 : (_tmp7_label12 = g_quark_from_static_string ("KP_5")))) {
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17410 "PhotoPage.c"
+#line 17359 "PhotoPage.c"
 			default:
 			{
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
-#line 2774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17417 "PhotoPage.c"
+#line 17366 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label13) ? _tmp7_label13 : (_tmp7_label13 = g_quark_from_static_string ("KP_0")))) {
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17423 "PhotoPage.c"
+#line 17372 "PhotoPage.c"
 			default:
 			{
-#line 2777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
-#line 2778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17430 "PhotoPage.c"
+#line 17379 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label14) ? _tmp7_label14 : (_tmp7_label14 = g_quark_from_static_string ("KP_9")))) {
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17436 "PhotoPage.c"
+#line 17385 "PhotoPage.c"
 			default:
 			{
-#line 2781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
-#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17443 "PhotoPage.c"
+#line 17392 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label15) ? _tmp7_label15 : (_tmp7_label15 = g_quark_from_static_string ("bracketright")))) {
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17449 "PhotoPage.c"
+#line 17398 "PhotoPage.c"
 			default:
 			{
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17456 "PhotoPage.c"
+#line 17405 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label16) ? _tmp7_label16 : (_tmp7_label16 = g_quark_from_static_string ("bracketleft")))) {
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17462 "PhotoPage.c"
+#line 17411 "PhotoPage.c"
 			default:
 			{
-#line 2789 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
-#line 2790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17469 "PhotoPage.c"
+#line 17418 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label17) ? _tmp7_label17 : (_tmp7_label17 = g_quark_from_static_string ("slash")))) {
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17475 "PhotoPage.c"
+#line 17424 "PhotoPage.c"
 			default:
 			{
-#line 2793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
-#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17482 "PhotoPage.c"
+#line 17431 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17488 "PhotoPage.c"
+#line 17437 "PhotoPage.c"
 			default:
 			{
-#line 2797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
-#line 2798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17495 "PhotoPage.c"
+#line 17444 "PhotoPage.c"
 			}
 		}
 	}
-#line 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = handled;
-#line 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17503 "PhotoPage.c"
+#line 17452 "PhotoPage.c"
 }
 
 
@@ -17515,44 +17464,44 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	GtkWindow* _tmp0_ = NULL;
 	FullscreenWindow* _tmp1_ = NULL;
 	FullscreenWindow* _tmp2_ = NULL;
-#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW) ? ((FullscreenWindow*) _tmp0_) : NULL;
-#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 17526 "PhotoPage.c"
+#line 17475 "PhotoPage.c"
 	}
-#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	fs = _tmp1_;
-#line 2806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = fs;
-#line 2806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->return_to_collection_on_release = TRUE;
-#line 17536 "PhotoPage.c"
+#line 17485 "PhotoPage.c"
 	} else {
 		FullscreenWindow* _tmp3_ = NULL;
-#line 2809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = fs;
-#line 2809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_close (_tmp3_);
-#line 17543 "PhotoPage.c"
+#line 17492 "PhotoPage.c"
 	}
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (fs);
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17551 "PhotoPage.c"
+#line 17500 "PhotoPage.c"
 }
 
 
@@ -17562,33 +17511,33 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu
 	gboolean _tmp0_ = FALSE;
 	GdkEventButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_to_collection_on_release;
-#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->return_to_collection_on_release = FALSE;
-#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_return_to_collection (self);
-#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17577 "PhotoPage.c"
+#line 17526 "PhotoPage.c"
 	}
-#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = PAGE_CLASS (library_photo_page_parent_class)->on_left_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp1_);
-#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17587 "PhotoPage.c"
+#line 17536 "PhotoPage.c"
 }
 
 
@@ -17597,13 +17546,13 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp7_ = NULL;
 	GtkMenu* _tmp8_ = NULL;
-#line 2827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
-#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->context_menu;
-#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 17602 "PhotoPage.c"
+#line 17551 "PhotoPage.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_ = NULL;
 		GObject* _tmp2_ = NULL;
@@ -17611,41 +17560,41 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 		GMenuModel* _tmp4_ = NULL;
 		GtkMenu* _tmp5_ = NULL;
 		GtkMenu* _tmp6_ = NULL;
-#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = gtk_builder_get_object (_tmp1_, "PhotoContextMenu");
-#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp2_) : NULL);
-#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		model = _tmp3_;
-#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = model;
-#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = (GtkMenu*) gtk_menu_new_from_model (_tmp4_);
-#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_object_ref_sink (_tmp5_);
-#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->context_menu);
-#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->context_menu = _tmp5_;
-#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = self->priv->context_menu;
-#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (model);
-#line 17634 "PhotoPage.c"
+#line 17583 "PhotoPage.c"
 	}
-#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->context_menu;
-#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp8_;
-#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17644 "PhotoPage.c"
+#line 17593 "PhotoPage.c"
 }
 
 
@@ -17655,25 +17604,25 @@ static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkE
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
 	GdkEventButton* _tmp2_ = NULL;
-#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_page_get_context_menu (self);
-#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
-#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, _tmp2_);
-#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17672 "PhotoPage.c"
+#line 17621 "PhotoPage.c"
 }
 
 
@@ -17682,59 +17631,59 @@ static gboolean library_photo_page_real_on_context_keypress (Page* base) {
 	gboolean result = FALSE;
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
-#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_page_get_context_menu (self);
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17695 "PhotoPage.c"
+#line 17644 "PhotoPage.c"
 }
 
 
 static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 	CollectionPage* _tmp0_ = NULL;
-#line 2850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_page;
-#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (NULL != _tmp0_) {
-#line 17707 "PhotoPage.c"
+#line 17656 "PhotoPage.c"
 		LibraryWindow* _tmp1_ = NULL;
 		LibraryWindow* _tmp2_ = NULL;
 		CollectionPage* _tmp3_ = NULL;
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = library_window_get_app ();
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->return_page;
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_page (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE, Page));
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 17721 "PhotoPage.c"
+#line 17670 "PhotoPage.c"
 	} else {
 		LibraryWindow* _tmp4_ = NULL;
 		LibraryWindow* _tmp5_ = NULL;
-#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = library_window_get_app ();
-#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp5_);
-#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp5_);
-#line 17733 "PhotoPage.c"
+#line 17682 "PhotoPage.c"
 	}
 }
 
@@ -17746,29 +17695,29 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
 	GeeArrayList* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2850 "/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);
-#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (photos, photo);
-#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _ ("Remove From Library");
-#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _ ("Removing Photo From Library");
-#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	remove_from_app (photos, _tmp2_, _tmp3_);
-#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photos);
-#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17767 "PhotoPage.c"
+#line 17716 "PhotoPage.c"
 }
 
 
@@ -17793,64 +17742,64 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 	TrashUntrashPhotosCommand* _tmp26_ = NULL;
 	LibraryWindow* _tmp27_ = NULL;
 	LibraryWindow* _tmp28_ = NULL;
-#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 17800 "PhotoPage.c"
+#line 17749 "PhotoPage.c"
 	}
-#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->return_page;
-#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT_PAGE)) {
-#line 17806 "PhotoPage.c"
+#line 17755 "PhotoPage.c"
 		LibraryWindow* _tmp2_ = NULL;
 		LibraryWindow* _tmp3_ = NULL;
-#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = library_window_get_app ();
-#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_set_page_switching_enabled (_tmp3_, FALSE);
-#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 17817 "PhotoPage.c"
+#line 17766 "PhotoPage.c"
 	}
-#line 2880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2869 "/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 2880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2871 "/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);
-#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = photos;
-#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (_tmp6_, _tmp7_);
-#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = photo;
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = 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"
+#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource));
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 17849 "PhotoPage.c"
+#line 17798 "PhotoPage.c"
 		LibraryWindow* _tmp13_ = NULL;
 		LibraryWindow* _tmp14_ = NULL;
 		GtkWindow* _tmp15_ = NULL;
@@ -17858,88 +17807,88 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 		gboolean _tmp17_ = FALSE;
 		LibraryWindow* _tmp20_ = NULL;
 		LibraryWindow* _tmp21_ = NULL;
-#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = library_window_get_app ();
-#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_set_page_switching_enabled (_tmp14_, TRUE);
-#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_FULLSCREEN_WINDOW);
-#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_) {
-#line 17875 "PhotoPage.c"
+#line 17824 "PhotoPage.c"
 			GtkWindow* _tmp18_ = NULL;
 			FullscreenWindow* _tmp19_ = NULL;
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp18_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			fullscreen_window_close (_tmp19_);
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp19_);
-#line 17886 "PhotoPage.c"
+#line 17835 "PhotoPage.c"
 		}
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = _tmp20_;
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp21_);
-#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 17896 "PhotoPage.c"
+#line 17845 "PhotoPage.c"
 	}
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = _tmp22_;
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = photos;
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = trash_untrash_photos_command_new (_tmp24_, TRUE);
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = _tmp25_;
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_COMMAND, Command));
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp26_);
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp23_);
-#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = library_window_get_app ();
-#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = _tmp27_;
-#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_window_set_page_switching_enabled (_tmp28_, TRUE);
-#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp28_);
-#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photos);
-#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17926 "PhotoPage.c"
+#line 17875 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 17938 "PhotoPage.c"
+#line 17887 "PhotoPage.c"
 		GeeArrayList* photo_list = NULL;
 		GeeArrayList* _tmp1_ = NULL;
 		GeeArrayList* _tmp2_ = NULL;
@@ -17953,62 +17902,62 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 		gboolean _tmp10_ = FALSE;
 		FlagUnflagCommand* _tmp11_ = NULL;
 		FlagUnflagCommand* _tmp12_ = NULL;
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2896 "/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);
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_list = _tmp1_;
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo_list;
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = photo_list;
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_FLAGGABLE, Flaggable));
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), !_tmp10_);
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo_list);
-#line 17992 "PhotoPage.c"
+#line 17941 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataSource* source) {
 	DataSource* _tmp0_ = NULL;
-#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = source;
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2904 "/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 18007 "PhotoPage.c"
+#line 17956 "PhotoPage.c"
 }
 
 
@@ -18030,100 +17979,100 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
 	Photo* _tmp17_ = NULL;
 	gboolean _tmp18_ = FALSE;
 	gboolean _tmp19_ = FALSE;
-#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18039 "PhotoPage.c"
+#line 17988 "PhotoPage.c"
 	} else {
 		LibraryPhoto* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo;
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource));
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp5_;
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 18057 "PhotoPage.c"
+#line 18006 "PhotoPage.c"
 	}
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18063 "PhotoPage.c"
+#line 18012 "PhotoPage.c"
 	}
-#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view = _tmp6_;
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = view;
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view;
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = view;
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = photo;
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = view_collection_get_view_for_source (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource));
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), _tmp14_);
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = photo;
-#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource));
-#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp17_);
-#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 18107 "PhotoPage.c"
+#line 18056 "PhotoPage.c"
 		LibraryWindow* _tmp20_ = NULL;
 		LibraryWindow* _tmp21_ = NULL;
-#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
-#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = _tmp20_;
-#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp21_);
-#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 18118 "PhotoPage.c"
+#line 18067 "PhotoPage.c"
 	}
-#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (view);
-#line 18122 "PhotoPage.c"
+#line 18071 "PhotoPage.c"
 }
 
 
@@ -18132,48 +18081,48 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 2935 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 18145 "PhotoPage.c"
+#line 18094 "PhotoPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 18172 "PhotoPage.c"
+#line 18121 "PhotoPage.c"
 	}
 }
 
@@ -18181,55 +18130,55 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
 static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 18186 "PhotoPage.c"
+#line 18135 "PhotoPage.c"
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = g_strcmp0 (_tmp5_, "") != 0;
-#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp5_);
-#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 18205 "PhotoPage.c"
+#line 18154 "PhotoPage.c"
 	} else {
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 18209 "PhotoPage.c"
+#line 18158 "PhotoPage.c"
 	}
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp0_);
-#line 18213 "PhotoPage.c"
+#line 18162 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18228 "PhotoPage.c"
+#line 18177 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp1_ = NULL;
@@ -18238,36 +18187,36 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		Photo* _tmp4_ = NULL;
 		AppWindow* _tmp5_ = NULL;
 		AppWindow* _tmp6_ = NULL;
-#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = app_window_get_instance ();
-#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_open_with_external_editor (_tmp4_, &_inner_error_);
-#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18255 "PhotoPage.c"
+#line 18204 "PhotoPage.c"
 			goto __catch248_g_error;
 		}
-#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 18266 "PhotoPage.c"
+#line 18215 "PhotoPage.c"
 	}
 	goto __finally248;
 	__catch248_g_error:
@@ -18278,42 +18227,42 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		GError* _tmp9_ = NULL;
 		Photo* _tmp10_ = NULL;
 		Photo* _tmp11_ = NULL;
-#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = app_window_get_instance ();
-#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = err;
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_;
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		open_external_editor_error_dialog (_tmp9_, _tmp11_);
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18301 "PhotoPage.c"
+#line 18250 "PhotoPage.c"
 	}
 	__finally248:
-#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("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 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18312 "PhotoPage.c"
+#line 18261 "PhotoPage.c"
 	}
 }
 
@@ -18325,31 +18274,31 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 	PhotoFileFormat _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18332 "PhotoPage.c"
+#line 18281 "PhotoPage.c"
 	}
-#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo_get_master_file_format (_tmp2_);
-#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_ != PHOTO_FILE_FORMAT_RAW;
-#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18348 "PhotoPage.c"
+#line 18297 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp5_ = NULL;
@@ -18358,36 +18307,36 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		Photo* _tmp8_ = NULL;
 		AppWindow* _tmp9_ = NULL;
 		AppWindow* _tmp10_ = NULL;
-#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_open_with_raw_external_editor (_tmp8_, &_inner_error_);
-#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18375 "PhotoPage.c"
+#line 18324 "PhotoPage.c"
 			goto __catch249_g_error;
 		}
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = app_window_get_instance ();
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 18386 "PhotoPage.c"
+#line 18335 "PhotoPage.c"
 	}
 	goto __finally249;
 	__catch249_g_error:
@@ -18398,74 +18347,74 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		GError* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = app_window_get_instance ();
-#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = err;
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = resources_launch_editor_failed (_tmp13_);
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp14_;
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		app_window_error_message (_tmp15_, NULL);
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp15_);
-#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18421 "PhotoPage.c"
+#line 18370 "PhotoPage.c"
 	}
 	__finally249:
-#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("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 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18432 "PhotoPage.c"
+#line 18381 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_send_to (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 18445 "PhotoPage.c"
+#line 18394 "PhotoPage.c"
 		ViewCollection* _tmp1_ = NULL;
 		ViewCollection* _tmp2_ = NULL;
 		GeeList* _tmp3_ = NULL;
 		GeeCollection* _tmp4_ = NULL;
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		desktop_integration_send_to (_tmp4_);
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 18464 "PhotoPage.c"
+#line 18413 "PhotoPage.c"
 	}
 }
 
@@ -18497,85 +18446,85 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 	gint _tmp17_ = 0;
 	Scaling _tmp18_ = {0};
 	GError * _inner_error_ = NULL;
-#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18504 "PhotoPage.c"
+#line 18453 "PhotoPage.c"
 	}
-#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _ ("Export Photo");
-#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = export_dialog_new (_tmp1_);
-#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	export_dialog = _tmp2_;
-#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	export_format_parameters_last (&_tmp3_);
-#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	export_params = _tmp3_;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = export_dialog;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = export_dialog_execute (_tmp4_, &_tmp5_, &_tmp6_, &export_params);
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale = _tmp5_;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	constraint = _tmp6_;
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp7_) {
-#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18532 "PhotoPage.c"
+#line 18481 "PhotoPage.c"
 	}
-#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = export_params;
-#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = photo_get_export_basename_for_parameters (_tmp9_, &_tmp10_);
-#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = export_ui_choose_file (_tmp12_);
-#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp12_);
-#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	save_as = _tmp14_;
-#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = save_as;
-#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_ == NULL) {
-#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (save_as);
-#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18564 "PhotoPage.c"
+#line 18513 "PhotoPage.c"
 	}
-#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = constraint;
-#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = scale;
-#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling_for_constraint (_tmp16_, _tmp17_, FALSE, &_tmp18_);
-#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling = _tmp18_;
-#line 18574 "PhotoPage.c"
+#line 18523 "PhotoPage.c"
 	{
 		Photo* _tmp19_ = NULL;
 		Photo* _tmp20_ = NULL;
@@ -18591,43 +18540,43 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		ExportFormatMode _tmp30_ = 0;
 		ExportFormatParameters _tmp31_ = {0};
 		gboolean _tmp32_ = FALSE;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = save_as;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = scaling;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = export_params;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_.quality;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp25_;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = export_params;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = photo_get_export_format_for_parameters (_tmp26_, &_tmp27_);
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = export_params;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = _tmp29_.mode;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = export_params;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = _tmp31_.export_metadata;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_export (_tmp20_, _tmp21_, &_tmp22_, _tmp24_, _tmp28_, _tmp30_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp32_, &_inner_error_);
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18626 "PhotoPage.c"
+#line 18575 "PhotoPage.c"
 			goto __catch250_g_error;
 		}
 	}
@@ -18643,56 +18592,56 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		const gchar* _tmp38_ = NULL;
 		gchar* _tmp39_ = NULL;
 		gchar* _tmp40_ = NULL;
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = _ ("Unable to export %s: %s");
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = save_as;
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp35_ = g_file_get_path (_tmp34_);
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = _tmp35_;
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = err;
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = _tmp37_->message;
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = g_strdup_printf (_tmp33_, _tmp36_, _tmp38_);
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = _tmp39_;
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		app_window_error_message (_tmp40_, NULL);
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp40_);
-#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp36_);
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18670 "PhotoPage.c"
+#line 18619 "PhotoPage.c"
 	}
 	__finally250:
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (save_as);
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("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 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18685 "PhotoPage.c"
+#line 18634 "PhotoPage.c"
 	}
-#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (save_as);
-#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 18691 "PhotoPage.c"
+#line 18640 "PhotoPage.c"
 }
 
 
@@ -18701,40 +18650,40 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 18714 "PhotoPage.c"
+#line 18663 "PhotoPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
 		GeeCollection* _tmp7_ = NULL;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		publishing_ui_publishing_dialog_go (_tmp7_);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 18733 "PhotoPage.c"
+#line 18682 "PhotoPage.c"
 	}
 }
 
@@ -18750,56 +18699,56 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
 	CommandManager* _tmp7_ = NULL;
 	CommandManager* _tmp8_ = NULL;
 	SetRatingSingleCommand* _tmp9_ = NULL;
-#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18757 "PhotoPage.c"
+#line 18706 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/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 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18764 "PhotoPage.c"
+#line 18713 "PhotoPage.c"
 	}
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18770 "PhotoPage.c"
+#line 18719 "PhotoPage.c"
 	}
-#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), TRUE);
-#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp6_;
-#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = command;
-#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18798 "PhotoPage.c"
+#line 18747 "PhotoPage.c"
 }
 
 
@@ -18814,56 +18763,56 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
 	CommandManager* _tmp7_ = NULL;
 	CommandManager* _tmp8_ = NULL;
 	SetRatingSingleCommand* _tmp9_ = NULL;
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18821 "PhotoPage.c"
+#line 18770 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/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"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18828 "PhotoPage.c"
+#line 18777 "PhotoPage.c"
 	}
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18834 "PhotoPage.c"
+#line 18783 "PhotoPage.c"
 	}
-#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), FALSE);
-#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp6_;
-#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = command;
-#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18862 "PhotoPage.c"
+#line 18811 "PhotoPage.c"
 }
 
 
@@ -18879,121 +18828,121 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat
 	CommandManager* _tmp8_ = NULL;
 	CommandManager* _tmp9_ = NULL;
 	SetRatingSingleCommand* _tmp10_ = NULL;
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3027 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18886 "PhotoPage.c"
+#line 18835 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/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"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18893 "PhotoPage.c"
+#line 18842 "PhotoPage.c"
 	}
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18899 "PhotoPage.c"
+#line 18848 "PhotoPage.c"
 	}
-#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = rating;
-#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = set_rating_single_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), _tmp5_);
-#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp7_;
-#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = command;
-#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
-#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp9_);
-#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3027 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18929 "PhotoPage.c"
+#line 18878 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self) {
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_REJECTED);
-#line 18938 "PhotoPage.c"
+#line 18887 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self) {
-#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_UNRATED);
-#line 18947 "PhotoPage.c"
+#line 18896 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_one (LibraryPhotoPage* self) {
-#line 3056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3057 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_ONE);
-#line 18956 "PhotoPage.c"
+#line 18905 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_two (LibraryPhotoPage* self) {
-#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_TWO);
-#line 18965 "PhotoPage.c"
+#line 18914 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_three (LibraryPhotoPage* self) {
-#line 3064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_THREE);
-#line 18974 "PhotoPage.c"
+#line 18923 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_four (LibraryPhotoPage* self) {
-#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3057 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FOUR);
-#line 18983 "PhotoPage.c"
+#line 18932 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_five (LibraryPhotoPage* self) {
-#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FIVE);
-#line 18992 "PhotoPage.c"
+#line 18941 "PhotoPage.c"
 }
 
 
@@ -19027,117 +18976,117 @@ static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhoto
 	Photo* _tmp26_ = NULL;
 	Rating _tmp27_ = 0;
 	gboolean _tmp28_ = FALSE;
-#line 3076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", _tmp2_ != RATING_REJECTED);
-#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", _tmp5_ != RATING_UNRATED);
-#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", _tmp8_ != RATING_ONE);
-#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo", _tmp11_ != RATING_TWO);
-#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_;
-#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", _tmp14_ != RATING_THREE);
-#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp13_);
-#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", _tmp17_ != RATING_FOUR);
-#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", _tmp20_ != RATING_FIVE);
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp19_);
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = _tmp21_;
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = rating_can_increase (_tmp23_);
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", _tmp24_);
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp22_);
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = _tmp25_;
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = rating_can_decrease (_tmp27_);
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp28_);
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp26_);
-#line 19122 "PhotoPage.c"
+#line 19071 "PhotoPage.c"
 }
 
 
-static GVariant* _variant_new14 (const gchar* value) {
-#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static GVariant* _variant_new18 (const gchar* value) {
+#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19129 "PhotoPage.c"
+#line 19078 "PhotoPage.c"
 }
 
 
-static GVariant* _variant_new15 (const gchar* value) {
-#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static GVariant* _variant_new19 (const gchar* value) {
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19136 "PhotoPage.c"
+#line 19085 "PhotoPage.c"
 }
 
 
@@ -19149,98 +19098,98 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 	PhotoFileFormat _tmp3_ = 0;
 	PhotoFileFormat _tmp4_ = 0;
 	PhotoFileFormat _tmp5_ = 0;
-#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = photo_get_master_file_format (_tmp1_);
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	format = _tmp3_;
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = format;
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp4_ == PHOTO_FILE_FORMAT_RAW);
-#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = format;
-#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ == PHOTO_FILE_FORMAT_RAW) {
-#line 19170 "PhotoPage.c"
+#line 19119 "PhotoPage.c"
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		RawDeveloper _tmp8_ = 0;
 		RawDeveloper _tmp9_ = 0;
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = photo_get_raw_developer (_tmp7_);
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp8_;
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (_tmp9_) {
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_SHOTWELL:
-#line 19189 "PhotoPage.c"
+#line 19138 "PhotoPage.c"
 			{
 				GAction* _tmp10_ = NULL;
 				GAction* _tmp11_ = NULL;
 				GVariant* _tmp12_ = NULL;
-#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
-#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp11_ = _tmp10_;
-#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp12_ = _variant_new14 ("'Shotwell'");
-#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp12_ = _variant_new18 ("Shotwell");
+#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_change_state (_tmp11_, _tmp12_);
-#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_variant_unref0 (_tmp12_);
-#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp11_);
-#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19208 "PhotoPage.c"
+#line 19157 "PhotoPage.c"
 			}
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_CAMERA:
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_EMBEDDED:
-#line 19214 "PhotoPage.c"
+#line 19163 "PhotoPage.c"
 			{
 				GAction* _tmp13_ = NULL;
 				GAction* _tmp14_ = NULL;
 				GVariant* _tmp15_ = NULL;
-#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp13_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
-#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp14_ = _tmp13_;
-#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp15_ = _variant_new15 ("'Camera'");
-#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp15_ = _variant_new19 ("Camera");
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_change_state (_tmp14_, _tmp15_);
-#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_variant_unref0 (_tmp15_);
-#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp14_);
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19233 "PhotoPage.c"
+#line 19182 "PhotoPage.c"
 			}
 			default:
 			{
-#line 3106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_assert_not_reached ();
-#line 19239 "PhotoPage.c"
+#line 19188 "PhotoPage.c"
 			}
 		}
 	}
@@ -19254,60 +19203,60 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM
 	Photo* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = map;
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = gee_map_has_key (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 19271 "PhotoPage.c"
+#line 19220 "PhotoPage.c"
 		GeeMap* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		gpointer _tmp9_ = NULL;
 		Alteration* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = map;
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = gee_map_get (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = (Alteration*) _tmp9_;
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = alteration_has_subject (_tmp10_, "metadata");
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp11_;
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_alteration_unref0 (_tmp10_);
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 19296 "PhotoPage.c"
+#line 19245 "PhotoPage.c"
 	} else {
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 19300 "PhotoPage.c"
+#line 19249 "PhotoPage.c"
 	}
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 19306 "PhotoPage.c"
+#line 19255 "PhotoPage.c"
 	}
 }
 
@@ -19323,29 +19272,29 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 	gint _names_size_ = 0;
 	gchar** _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = add_tags_dialog_new ();
-#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dialog = _tmp0_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = dialog;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = add_tags_dialog_execute (_tmp1_, &_tmp2_);
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names = _tmp3_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names_length1 = _tmp2_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_names_size_ = names_length1;
-#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = names;
-#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4__length1 = names_length1;
-#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 19344 "PhotoPage.c"
+#line 19293 "PhotoPage.c"
 		CommandManager* _tmp5_ = NULL;
 		CommandManager* _tmp6_ = NULL;
 		HierarchicalTagIndex* _tmp7_ = NULL;
@@ -19362,57 +19311,57 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 		GeeCollection* _tmp16_ = NULL;
 		AddTagsCommand* _tmp17_ = NULL;
 		AddTagsCommand* _tmp18_ = NULL;
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = hierarchical_tag_index_get_global_index ();
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = names;
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9__length1 = names_length1;
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = hierarchical_tag_index_get_paths_for_names_array (_tmp8_, _tmp9_, _tmp9__length1, &_tmp10_);
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12__length1 = _tmp10_;
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = view_collection_get_selected_sources (_tmp14_);
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = add_tags_command_new (_tmp12_, _tmp10_, _tmp16_);
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command));
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_free), NULL);
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_hierarchical_tag_index_unref0 (_tmp8_);
-#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 19405 "PhotoPage.c"
+#line 19354 "PhotoPage.c"
 	}
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 19411 "PhotoPage.c"
+#line 19360 "PhotoPage.c"
 }
 
 
@@ -19437,77 +19386,77 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
 	GeeArrayList* _tmp14_ = NULL;
 	ModifyTagsCommand* _tmp15_ = NULL;
 	ModifyTagsCommand* _tmp16_ = NULL;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_at (_tmp1_, 0);
-#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = data_view_get_source (_tmp3_);
-#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp5_;
-#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = photo;
-#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = modify_tags_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dialog = _tmp7_;
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = dialog;
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = modify_tags_dialog_execute (_tmp8_);
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_tags = _tmp9_;
-#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = new_tags;
-#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ == NULL) {
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (new_tags);
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_text_entry_dialog_mediator_unref0 (dialog);
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 19480 "PhotoPage.c"
+#line 19429 "PhotoPage.c"
 	}
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = photo;
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_tags;
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = modify_tags_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (new_tags);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 19506 "PhotoPage.c"
+#line 19455 "PhotoPage.c"
 }
 
 
@@ -19539,7 +19488,7 @@ static gboolean library_photo_page_library_photo_page_view_filter_real_predicate
 	result = _tmp4_;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 19538 "PhotoPage.c"
+#line 19487 "PhotoPage.c"
 }
 
 
@@ -19549,14 +19498,14 @@ static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_ph
 	self = (LibraryPhotoPageLibraryPhotoPageViewFilter*) view_filter_construct (object_type);
 #line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 19548 "PhotoPage.c"
+#line 19497 "PhotoPage.c"
 }
 
 
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void) {
 #line 2330 "/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 19555 "PhotoPage.c"
+#line 19504 "PhotoPage.c"
 }
 
 
@@ -19565,7 +19514,7 @@ static void library_photo_page_library_photo_page_view_filter_class_init (Librar
 	library_photo_page_library_photo_page_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((ViewFilterClass *) klass)->predicate = library_photo_page_library_photo_page_view_filter_real_predicate;
-#line 19564 "PhotoPage.c"
+#line 19513 "PhotoPage.c"
 }
 
 
@@ -19628,7 +19577,7 @@ static void library_photo_page_class_init (LibraryPhotoPageClass * klass) {
 	((PageClass *) klass)->on_context_keypress = library_photo_page_real_on_context_keypress;
 #line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_photo_page_finalize;
-#line 19627 "PhotoPage.c"
+#line 19576 "PhotoPage.c"
 }
 
 
@@ -19644,7 +19593,7 @@ static void library_photo_page_instance_init (LibraryPhotoPage * self) {
 	_tmp0_ = library_photo_page_library_photo_page_view_filter_new ();
 #line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->filter = _tmp0_;
-#line 19643 "PhotoPage.c"
+#line 19592 "PhotoPage.c"
 }
 
 
@@ -19685,11 +19634,11 @@ static void library_photo_page_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->return_page);
 #line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_view_filter_unref0 (self->priv->filter);
-#line 2825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->context_menu);
 #line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (library_photo_page_parent_class)->finalize (obj);
-#line 19688 "PhotoPage.c"
+#line 19637 "PhotoPage.c"
 }
 
 
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index 3ad2076..a6fb529 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -2438,10 +2438,10 @@ public class LibraryPhotoPage : EditingHostPage {
         base.add_actions ();
 
         AppWindow.get_instance ().add_action_entries (entries, this);
-        (get_action ("ViewRatings") as GLib.SimpleAction).set_state (Config.Facade.get_instance ().get_display_photo_ratings ());
+        (get_action ("ViewRatings") as GLib.SimpleAction).change_state (Config.Facade.get_instance ().get_display_photo_ratings ());
         var d = Config.Facade.get_instance().get_default_raw_developer();
         var action = get_action ("RawDeveloper") as GLib.SimpleAction;
-        action.set_state (d == RawDeveloper.SHOTWELL ? "'Shotwell'" : "'Camera'");
+        action.change_state (d == RawDeveloper.SHOTWELL ? "Shotwell" : "Camera");
     }
 
     protected override InjectionGroup[] init_collect_injection_groups() {
@@ -2458,7 +2458,7 @@ public class LibraryPhotoPage : EditingHostPage {
         groups += publish_group;
         
         InjectionGroup bg_group = new InjectionGroup("SetBackgroundPlaceholder");
-        bg_group.add_menu_item(_("Set as _Desktop Background"), "SetBackground");
+        bg_group.add_menu_item(_("Set as _Desktop Background"), "SetBackground", "<Primary>b");
         
         groups += bg_group;
         
@@ -2569,18 +2569,7 @@ public class LibraryPhotoPage : EditingHostPage {
     }
     
     private void update_flag_action() {
-        if (has_photo()) {
-            var action = get_action("Flag") as GLib.SimpleAction;
-            assert(action != null);
-            
-//            bool is_flagged = ((LibraryPhoto) get_photo()).is_flagged();
-            
-            debug ("Setting label of action flagged");
-//            action.label = is_flagged ? Resources.UNFLAG_MENU : Resources.FLAG_MENU;
-            action.set_enabled (true);
-        } else {
-            set_action_sensitive("Flag", false);
-        }
+        set_action_sensitive ("Flag", has_photo());
     }
     
     // Displays a photo from a specific CollectionPage.  When the user exits this view,
@@ -3094,12 +3083,12 @@ public class LibraryPhotoPage : EditingHostPage {
             // Set active developer in menu.
             switch (get_photo().get_raw_developer()) {
                 case RawDeveloper.SHOTWELL:
-                    get_action ("RawDeveloper").change_state ("'Shotwell'");
+                    get_action ("RawDeveloper").change_state ("Shotwell");
                     break;
                 
                 case RawDeveloper.CAMERA:
                 case RawDeveloper.EMBEDDED:
-                    get_action ("RawDeveloper").change_state ("'Camera'");
+                    get_action ("RawDeveloper").change_state ("Camera");
                     break;
                 
                 default:
diff --git a/src/PixbufCache.c b/src/PixbufCache.c
index 3fbf1a8..540a79f 100644
--- a/src/PixbufCache.c
+++ b/src/PixbufCache.c
@@ -1,4 +1,4 @@
-/* PixbufCache.c generated by valac 0.34.2, the Vala compiler
+/* PixbufCache.c generated by valac 0.32.1, the Vala compiler
  * generated from PixbufCache.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2288,7 +2288,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2291 "PixbufCache.c"
-			goto __catch452_g_error;
+			goto __catch450_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2302,8 +2302,8 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp0_);
 #line 2304 "PixbufCache.c"
 	}
-	goto __finally452;
-	__catch452_g_error:
+	goto __finally450;
+	__catch450_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2324,7 +2324,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2326 "PixbufCache.c"
 	}
-	__finally452:
+	__finally450:
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2427,7 +2427,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2430 "PixbufCache.c"
-			goto __catch453_g_error;
+			goto __catch451_g_error;
 		}
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2441,8 +2441,8 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp0_);
 #line 2443 "PixbufCache.c"
 	}
-	goto __finally453;
-	__catch453_g_error:
+	goto __finally451;
+	__catch451_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2463,7 +2463,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2465 "PixbufCache.c"
 	}
-	__finally453:
+	__finally451:
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2510,7 +2510,7 @@ static void pixbuf_cache_class_init (PixbufCacheClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	G_OBJECT_CLASS (klass)->finalize = pixbuf_cache_finalize;
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	g_signal_new ("fetched", TYPE_PIXBUF_CACHE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER, G_TYPE_NONE, 3, TYPE_PHOTO, gdk_pixbuf_get_type (), G_TYPE_POINTER);
+	g_signal_new ("fetched", TYPE_PIXBUF_CACHE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER, G_TYPE_NONE, 3, TYPE_PHOTO, GDK_TYPE_PIXBUF, G_TYPE_POINTER);
 #line 2515 "PixbufCache.c"
 }
 
@@ -2522,7 +2522,7 @@ 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, g_object_unref, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, 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"
diff --git a/src/Printing.c b/src/Printing.c
index 3a70b0f..70750fa 100644
--- a/src/Printing.c
+++ b/src/Printing.c
@@ -1,4 +1,4 @@
-/* Printing.c generated by valac 0.34.2, the Vala compiler
+/* Printing.c generated by valac 0.32.1, the Vala compiler
  * generated from Printing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2944,15 +2944,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 2958 "Printing.c"
 }
@@ -3433,15 +3433,15 @@ static gdouble double_parse (const gchar* str) {
 	gdouble result = 0.0;
 	const gchar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 869 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 869 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0.0);
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtod (_tmp0_, NULL);
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 3447 "Printing.c"
 }
@@ -3503,17 +3503,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 3519 "Printing.c"
 }
@@ -6415,7 +6415,7 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6417 "Printing.c"
-			goto __catch467_g_error;
+			goto __catch465_g_error;
 		}
 #line 895 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_result_ == GTK_PRINT_OPERATION_RESULT_APPLY) {
@@ -6433,8 +6433,8 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 6433 "Printing.c"
 		}
 	}
-	goto __finally467;
-	__catch467_g_error:
+	goto __finally465;
+	__catch465_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp22_ = NULL;
@@ -6460,7 +6460,7 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 		_g_error_free0 (e);
 #line 6461 "Printing.c"
 	}
-	__finally467:
+	__finally465:
 #line 892 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 892 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7984,7 +7984,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 #line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7986 "Printing.c"
-				goto __catch468_g_error;
+				goto __catch466_g_error;
 			}
 #line 1090 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp52_ = photo_pixbuf;
@@ -8111,7 +8111,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 #line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8113 "Printing.c"
-				goto __catch468_g_error;
+				goto __catch466_g_error;
 			}
 #line 1105 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp85_ = photo_pixbuf;
@@ -8137,8 +8137,8 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		cairo_paint (_tmp89_);
 #line 8138 "Printing.c"
 	}
-	goto __finally468;
-	__catch468_g_error:
+	goto __finally466;
+	__catch466_g_error:
 	{
 		GError* e = NULL;
 		PrintJob* _tmp90_ = NULL;
@@ -8173,7 +8173,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		_g_error_free0 (e);
 #line 8174 "Printing.c"
 	}
-	__finally468:
+	__finally466:
 #line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
diff --git a/src/Properties.c b/src/Properties.c
index 1ac8e72..1b97778 100644
--- a/src/Properties.c
+++ b/src/Properties.c
@@ -1,4 +1,4 @@
-/* Properties.c generated by valac 0.34.2, the Vala compiler
+/* Properties.c generated by valac 0.32.1, the Vala compiler
  * generated from Properties.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1015,35 +1015,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 1049 "Properties.c"
 }
@@ -1053,15 +1053,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 1067 "Properties.c"
 }
@@ -1074,37 +1074,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 1090 "Properties.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1098 "Properties.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1110 "Properties.c"
 	}
@@ -1124,112 +1124,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 1134 "Properties.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 1140 "Properties.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 1144 "Properties.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 1148 "Properties.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 1160 "Properties.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 1170 "Properties.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 1176 "Properties.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 1190 "Properties.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 1200 "Properties.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 1206 "Properties.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 1215 "Properties.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 1235 "Properties.c"
 }
@@ -1342,13 +1342,13 @@ gchar* properties_get_prettyprint_time_with_seconds (Properties* self, struct tm
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return;
 #line 1354 "Properties.c"
 }
@@ -4512,7 +4512,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 #line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4515 "Properties.c"
-				goto __catch432_g_error;
+				goto __catch430_g_error;
 			}
 #line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp23_ = _tmp20_;
@@ -4526,8 +4526,8 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_media_metadata_unref0 (_tmp20_);
 #line 4528 "Properties.c"
 		}
-		goto __finally432;
-		__catch432_g_error:
+		goto __finally430;
+		__catch430_g_error:
 		{
 			GError* e = NULL;
 			Photo* _tmp24_ = NULL;
@@ -4548,7 +4548,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_g_error_free0 (e);
 #line 4550 "Properties.c"
 		}
-		__finally432:
+		__finally430:
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4802,11 +4802,11 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 4812 "Properties.c"
 	{
@@ -4821,98 +4821,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4843 "Properties.c"
-				goto __catch433_g_regex_error;
+				goto __catch431_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 4852 "Properties.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4868 "Properties.c"
-				goto __catch433_g_regex_error;
+				goto __catch431_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 4879 "Properties.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 4893 "Properties.c"
 	}
-	goto __finally433;
-	__catch433_g_regex_error:
+	goto __finally431;
+	__catch431_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 4907 "Properties.c"
 	}
-	__finally433:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	__finally431:
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
 #line 4918 "Properties.c"
 	}
diff --git a/src/Resources.c b/src/Resources.c
index a978be8..3a59fbe 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -1,4 +1,4 @@
-/* Resources.c generated by valac 0.34.2, the Vala compiler
+/* Resources.c generated by valac 0.32.1, the Vala compiler
  * generated from Resources.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -16,8 +16,8 @@
 #include <float.h>
 #include <math.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtk.h>
 #include <gee.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <locale.h>
 #include <langinfo.h>
@@ -30,8 +30,6 @@
 #define TYPE_RATING_FILTER (rating_filter_get_type ())
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _gtk_icon_set_unref0(var) ((var == NULL) ? NULL : (var = (gtk_icon_set_unref (var), NULL)))
-#define _gtk_icon_info_free0(var) ((var == NULL) ? NULL : (var = (gtk_icon_info_free (var), NULL)))
 
 typedef enum  {
 	RATING_REJECTED = -1,
@@ -61,7 +59,6 @@ typedef enum  {
 	RATING_FILTER_FIVE_ONLY = 14
 } RatingFilter;
 
-typedef void (*ResourcesAddStockIconModify) (GdkPixbuf* pixbuf, void* user_data);
 
 extern gchar* resources_RATE_ONE_LABEL;
 extern gchar* resources_RATE_TWO_LABEL;
@@ -133,8 +130,6 @@ gchar* resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP = NULL;
 gchar* resources_DISPLAY_FIVE_OR_HIGHER_MENU = NULL;
 gchar* resources_DISPLAY_FIVE_OR_HIGHER_LABEL = NULL;
 gchar* resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP = NULL;
-extern GtkIconFactory* resources_factory;
-GtkIconFactory* resources_factory = NULL;
 extern GeeHashMap* resources_icon_cache;
 GeeHashMap* resources_icon_cache = NULL;
 extern GeeHashMap* resources_scaled_icon_cache;
@@ -454,10 +449,6 @@ gchar* resources_jump_to_file_failed (GError* err);
 #define RESOURCES_SELECT_ALL_TOOLTIP _ ("Select all items")
 void resources_init (void);
 GFile* app_dirs_get_resources_dir (void);
-void resources_add_stock_icon (GFile* file, const gchar* stock_id);
-void resources_add_stock_icon_from_themed_icon (GThemedIcon* gicon, const gchar* stock_id, ResourcesAddStockIconModify modify, void* modify_target);
-void dim_pixbuf (GdkPixbuf* pixbuf);
-static void _dim_pixbuf_resources_add_stock_icon_modify (GdkPixbuf* pixbuf, gpointer self);
 void resources_terminate (void);
 void resources_fetch_lc_time_format (void);
 gchar* resources_get_hh_mm_format_string (void);
@@ -514,7 +505,7 @@ gchar* resources_launch_editor_failed (GError* err) {
 	result = _tmp3_;
 #line 335 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 490 "Resources.c"
+#line 481 "Resources.c"
 }
 
 
@@ -528,7 +519,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 	_tmp0__length1 = names_length1;
 #line 339 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0__length1 == 1) {
-#line 504 "Resources.c"
+#line 495 "Resources.c"
 		const gchar* _tmp1_ = NULL;
 		gchar** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
@@ -559,7 +550,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 		result = _tmp7_;
 #line 340 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 535 "Resources.c"
+#line 526 "Resources.c"
 	} else {
 		gchar** _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
@@ -569,7 +560,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 		_tmp8__length1 = names_length1;
 #line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp8__length1 == 2) {
-#line 545 "Resources.c"
+#line 536 "Resources.c"
 			const gchar* _tmp9_ = NULL;
 			gchar** _tmp10_ = NULL;
 			gint _tmp10__length1 = 0;
@@ -617,7 +608,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 			result = _tmp19_;
 #line 343 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 593 "Resources.c"
+#line 584 "Resources.c"
 		} else {
 			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
@@ -629,7 +620,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 			result = _tmp21_;
 #line 348 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 605 "Resources.c"
+#line 596 "Resources.c"
 		}
 	}
 }
@@ -652,7 +643,7 @@ gchar* resources_delete_tag_menu (const gchar* name) {
 	result = _tmp2_;
 #line 353 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 628 "Resources.c"
+#line 619 "Resources.c"
 }
 
 
@@ -673,7 +664,7 @@ gchar* resources_delete_tag_label (const gchar* name) {
 	result = _tmp2_;
 #line 357 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 649 "Resources.c"
+#line 640 "Resources.c"
 }
 
 
@@ -694,7 +685,7 @@ gchar* resources_rename_tag_menu (const gchar* name) {
 	result = _tmp2_;
 #line 366 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 670 "Resources.c"
+#line 661 "Resources.c"
 }
 
 
@@ -720,7 +711,7 @@ gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name)
 	result = _tmp3_;
 #line 370 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 696 "Resources.c"
+#line 687 "Resources.c"
 }
 
 
@@ -744,7 +735,7 @@ gchar* resources_tag_photos_label (const gchar* name, gint count) {
 	result = _tmp3_;
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 720 "Resources.c"
+#line 711 "Resources.c"
 }
 
 
@@ -768,7 +759,7 @@ gchar* resources_tag_photos_tooltip (const gchar* name, gint count) {
 	result = _tmp3_;
 #line 385 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 744 "Resources.c"
+#line 735 "Resources.c"
 }
 
 
@@ -792,7 +783,7 @@ gchar* resources_untag_photos_menu (const gchar* name, gint count) {
 	result = _tmp3_;
 #line 391 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 768 "Resources.c"
+#line 759 "Resources.c"
 }
 
 
@@ -816,7 +807,7 @@ gchar* resources_untag_photos_label (const gchar* name, gint count) {
 	result = _tmp3_;
 #line 397 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 792 "Resources.c"
+#line 783 "Resources.c"
 }
 
 
@@ -837,7 +828,7 @@ gchar* resources_rename_tag_exists_message (const gchar* name) {
 	result = _tmp2_;
 #line 403 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 813 "Resources.c"
+#line 804 "Resources.c"
 }
 
 
@@ -858,7 +849,7 @@ gchar* resources_rename_search_exists_message (const gchar* name) {
 	result = _tmp2_;
 #line 407 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 834 "Resources.c"
+#line 825 "Resources.c"
 }
 
 
@@ -884,7 +875,7 @@ gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_na
 	result = _tmp3_;
 #line 419 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 860 "Resources.c"
+#line 851 "Resources.c"
 }
 
 
@@ -905,7 +896,7 @@ gchar* resources_delete_search_label (const gchar* name) {
 	result = _tmp2_;
 #line 423 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 881 "Resources.c"
+#line 872 "Resources.c"
 }
 
 
@@ -918,27 +909,27 @@ const gchar* resources_rating_label (Rating rating) {
 	switch (_tmp0_) {
 #line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 894 "Resources.c"
+#line 885 "Resources.c"
 		{
 #line 429 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_REJECTED_LABEL;
 #line 429 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 900 "Resources.c"
+#line 891 "Resources.c"
 		}
 #line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 904 "Resources.c"
+#line 895 "Resources.c"
 		{
 #line 431 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_LABEL;
 #line 431 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 910 "Resources.c"
+#line 901 "Resources.c"
 		}
 #line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 914 "Resources.c"
+#line 905 "Resources.c"
 		{
 			const gchar* _tmp1_ = NULL;
 #line 433 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -947,11 +938,11 @@ const gchar* resources_rating_label (Rating rating) {
 			result = _tmp1_;
 #line 433 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 923 "Resources.c"
+#line 914 "Resources.c"
 		}
 #line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 927 "Resources.c"
+#line 918 "Resources.c"
 		{
 			const gchar* _tmp2_ = NULL;
 #line 435 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -960,11 +951,11 @@ const gchar* resources_rating_label (Rating rating) {
 			result = _tmp2_;
 #line 435 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 936 "Resources.c"
+#line 927 "Resources.c"
 		}
 #line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 940 "Resources.c"
+#line 931 "Resources.c"
 		{
 			const gchar* _tmp3_ = NULL;
 #line 437 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -973,11 +964,11 @@ const gchar* resources_rating_label (Rating rating) {
 			result = _tmp3_;
 #line 437 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 949 "Resources.c"
+#line 940 "Resources.c"
 		}
 #line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 953 "Resources.c"
+#line 944 "Resources.c"
 		{
 			const gchar* _tmp4_ = NULL;
 #line 439 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -986,11 +977,11 @@ const gchar* resources_rating_label (Rating rating) {
 			result = _tmp4_;
 #line 439 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 962 "Resources.c"
+#line 953 "Resources.c"
 		}
 #line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 966 "Resources.c"
+#line 957 "Resources.c"
 		{
 			const gchar* _tmp5_ = NULL;
 #line 441 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -999,7 +990,7 @@ const gchar* resources_rating_label (Rating rating) {
 			result = _tmp5_;
 #line 441 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 975 "Resources.c"
+#line 966 "Resources.c"
 		}
 		default:
 		{
@@ -1007,7 +998,7 @@ const gchar* resources_rating_label (Rating rating) {
 			result = RESOURCES_RATE_UNRATED_LABEL;
 #line 443 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 983 "Resources.c"
+#line 974 "Resources.c"
 		}
 	}
 }
@@ -1022,27 +1013,27 @@ const gchar* resources_rating_combo_box (Rating rating) {
 	switch (_tmp0_) {
 #line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 998 "Resources.c"
+#line 989 "Resources.c"
 		{
 #line 450 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_REJECTED_COMBO_BOX;
 #line 450 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1004 "Resources.c"
+#line 995 "Resources.c"
 		}
 #line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 1008 "Resources.c"
+#line 999 "Resources.c"
 		{
 #line 452 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_COMBO_BOX;
 #line 452 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1014 "Resources.c"
+#line 1005 "Resources.c"
 		}
 #line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1018 "Resources.c"
+#line 1009 "Resources.c"
 		{
 			const gchar* _tmp1_ = NULL;
 #line 454 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1051,11 +1042,11 @@ const gchar* resources_rating_combo_box (Rating rating) {
 			result = _tmp1_;
 #line 454 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1027 "Resources.c"
+#line 1018 "Resources.c"
 		}
 #line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1031 "Resources.c"
+#line 1022 "Resources.c"
 		{
 			const gchar* _tmp2_ = NULL;
 #line 456 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1064,11 +1055,11 @@ const gchar* resources_rating_combo_box (Rating rating) {
 			result = _tmp2_;
 #line 456 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1040 "Resources.c"
+#line 1031 "Resources.c"
 		}
 #line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1044 "Resources.c"
+#line 1035 "Resources.c"
 		{
 			const gchar* _tmp3_ = NULL;
 #line 458 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1077,11 +1068,11 @@ const gchar* resources_rating_combo_box (Rating rating) {
 			result = _tmp3_;
 #line 458 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1053 "Resources.c"
+#line 1044 "Resources.c"
 		}
 #line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1057 "Resources.c"
+#line 1048 "Resources.c"
 		{
 			const gchar* _tmp4_ = NULL;
 #line 460 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1090,11 +1081,11 @@ const gchar* resources_rating_combo_box (Rating rating) {
 			result = _tmp4_;
 #line 460 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1066 "Resources.c"
+#line 1057 "Resources.c"
 		}
 #line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1070 "Resources.c"
+#line 1061 "Resources.c"
 		{
 			const gchar* _tmp5_ = NULL;
 #line 462 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1103,7 +1094,7 @@ const gchar* resources_rating_combo_box (Rating rating) {
 			result = _tmp5_;
 #line 462 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1079 "Resources.c"
+#line 1070 "Resources.c"
 		}
 		default:
 		{
@@ -1111,7 +1102,7 @@ const gchar* resources_rating_combo_box (Rating rating) {
 			result = RESOURCES_RATE_UNRATED_MENU;
 #line 464 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1087 "Resources.c"
+#line 1078 "Resources.c"
 		}
 	}
 }
@@ -1126,7 +1117,7 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 	switch (_tmp0_) {
 #line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1102 "Resources.c"
+#line 1093 "Resources.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 471 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1135,11 +1126,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp1_;
 #line 471 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1111 "Resources.c"
+#line 1102 "Resources.c"
 		}
 #line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 1115 "Resources.c"
+#line 1106 "Resources.c"
 		{
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
@@ -1151,11 +1142,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp3_;
 #line 474 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1127 "Resources.c"
+#line 1118 "Resources.c"
 		}
 #line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 1131 "Resources.c"
+#line 1122 "Resources.c"
 		{
 			const gchar* _tmp4_ = NULL;
 			gchar* _tmp5_ = NULL;
@@ -1167,11 +1158,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp5_;
 #line 477 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1143 "Resources.c"
+#line 1134 "Resources.c"
 		}
 #line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 1147 "Resources.c"
+#line 1138 "Resources.c"
 		{
 			const gchar* _tmp6_ = NULL;
 			gchar* _tmp7_ = NULL;
@@ -1183,11 +1174,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp7_;
 #line 480 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1159 "Resources.c"
+#line 1150 "Resources.c"
 		}
 #line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1163 "Resources.c"
+#line 1154 "Resources.c"
 		{
 			const gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
@@ -1199,13 +1190,13 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp9_;
 #line 483 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1175 "Resources.c"
+#line 1166 "Resources.c"
 		}
 #line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FIVE_ONLY:
 #line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1181 "Resources.c"
+#line 1172 "Resources.c"
 		{
 			const gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
@@ -1217,11 +1208,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp11_;
 #line 487 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1193 "Resources.c"
+#line 1184 "Resources.c"
 		}
 #line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 1197 "Resources.c"
+#line 1188 "Resources.c"
 		{
 			gchar* _tmp12_ = NULL;
 #line 490 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1230,12 +1221,12 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp12_;
 #line 490 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1206 "Resources.c"
+#line 1197 "Resources.c"
 		}
 		default:
 #line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1211 "Resources.c"
+#line 1202 "Resources.c"
 		{
 			gchar* _tmp13_ = NULL;
 #line 494 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1244,7 +1235,7 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp13_;
 #line 494 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1220 "Resources.c"
+#line 1211 "Resources.c"
 		}
 	}
 }
@@ -1259,7 +1250,7 @@ gchar* resources_rating_progress (Rating rating) {
 	switch (_tmp0_) {
 #line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1235 "Resources.c"
+#line 1226 "Resources.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 501 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1268,11 +1259,11 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp1_;
 #line 501 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1244 "Resources.c"
+#line 1235 "Resources.c"
 		}
 #line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 1248 "Resources.c"
+#line 1239 "Resources.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 503 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1281,11 +1272,11 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp2_;
 #line 503 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1257 "Resources.c"
+#line 1248 "Resources.c"
 		}
 #line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1261 "Resources.c"
+#line 1252 "Resources.c"
 		{
 			const gchar* _tmp3_ = NULL;
 			gchar* _tmp4_ = NULL;
@@ -1297,11 +1288,11 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp4_;
 #line 505 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1273 "Resources.c"
+#line 1264 "Resources.c"
 		}
 #line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1277 "Resources.c"
+#line 1268 "Resources.c"
 		{
 			const gchar* _tmp5_ = NULL;
 			gchar* _tmp6_ = NULL;
@@ -1313,11 +1304,11 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp6_;
 #line 507 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1289 "Resources.c"
+#line 1280 "Resources.c"
 		}
 #line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1293 "Resources.c"
+#line 1284 "Resources.c"
 		{
 			const gchar* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
@@ -1329,11 +1320,11 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp8_;
 #line 509 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1305 "Resources.c"
+#line 1296 "Resources.c"
 		}
 #line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1309 "Resources.c"
+#line 1300 "Resources.c"
 		{
 			const gchar* _tmp9_ = NULL;
 			gchar* _tmp10_ = NULL;
@@ -1345,11 +1336,11 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp10_;
 #line 511 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1321 "Resources.c"
+#line 1312 "Resources.c"
 		}
 #line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1325 "Resources.c"
+#line 1316 "Resources.c"
 		{
 			const gchar* _tmp11_ = NULL;
 			gchar* _tmp12_ = NULL;
@@ -1361,7 +1352,7 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp12_;
 #line 513 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1337 "Resources.c"
+#line 1328 "Resources.c"
 		}
 		default:
 		{
@@ -1372,7 +1363,7 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp13_;
 #line 515 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1348 "Resources.c"
+#line 1339 "Resources.c"
 		}
 	}
 }
@@ -1387,7 +1378,7 @@ gchar* resources_get_stars (Rating rating) {
 	switch (_tmp0_) {
 #line 522 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1363 "Resources.c"
+#line 1354 "Resources.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 524 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1396,11 +1387,11 @@ gchar* resources_get_stars (Rating rating) {
 			result = _tmp1_;
 #line 524 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1372 "Resources.c"
+#line 1363 "Resources.c"
 		}
 #line 522 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1376 "Resources.c"
+#line 1367 "Resources.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 526 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1409,11 +1400,11 @@ gchar* resources_get_stars (Rating rating) {
 			result = _tmp2_;
 #line 526 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1385 "Resources.c"
+#line 1376 "Resources.c"
 		}
 #line 522 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1389 "Resources.c"
+#line 1380 "Resources.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 528 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1422,11 +1413,11 @@ gchar* resources_get_stars (Rating rating) {
 			result = _tmp3_;
 #line 528 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1398 "Resources.c"
+#line 1389 "Resources.c"
 		}
 #line 522 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1402 "Resources.c"
+#line 1393 "Resources.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 530 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1435,11 +1426,11 @@ gchar* resources_get_stars (Rating rating) {
 			result = _tmp4_;
 #line 530 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1411 "Resources.c"
+#line 1402 "Resources.c"
 		}
 #line 522 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1415 "Resources.c"
+#line 1406 "Resources.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 532 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1448,7 +1439,7 @@ gchar* resources_get_stars (Rating rating) {
 			result = _tmp5_;
 #line 532 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1424 "Resources.c"
+#line 1415 "Resources.c"
 		}
 		default:
 		{
@@ -1459,7 +1450,7 @@ gchar* resources_get_stars (Rating rating) {
 			result = _tmp6_;
 #line 534 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1435 "Resources.c"
+#line 1426 "Resources.c"
 		}
 	}
 }
@@ -1474,7 +1465,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 	switch (_tmp0_) {
 #line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1450 "Resources.c"
+#line 1441 "Resources.c"
 		{
 			gint _tmp1_ = 0;
 			GdkPixbuf* _tmp2_ = NULL;
@@ -1486,11 +1477,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp2_;
 #line 541 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1462 "Resources.c"
+#line 1453 "Resources.c"
 		}
 #line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1466 "Resources.c"
+#line 1457 "Resources.c"
 		{
 			gint _tmp3_ = 0;
 			GdkPixbuf* _tmp4_ = NULL;
@@ -1502,11 +1493,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp4_;
 #line 544 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1478 "Resources.c"
+#line 1469 "Resources.c"
 		}
 #line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1482 "Resources.c"
+#line 1473 "Resources.c"
 		{
 			gint _tmp5_ = 0;
 			GdkPixbuf* _tmp6_ = NULL;
@@ -1518,11 +1509,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp6_;
 #line 546 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1494 "Resources.c"
+#line 1485 "Resources.c"
 		}
 #line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1498 "Resources.c"
+#line 1489 "Resources.c"
 		{
 			gint _tmp7_ = 0;
 			GdkPixbuf* _tmp8_ = NULL;
@@ -1534,11 +1525,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp8_;
 #line 548 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1510 "Resources.c"
+#line 1501 "Resources.c"
 		}
 #line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1514 "Resources.c"
+#line 1505 "Resources.c"
 		{
 			gint _tmp9_ = 0;
 			GdkPixbuf* _tmp10_ = NULL;
@@ -1550,11 +1541,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp10_;
 #line 550 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1526 "Resources.c"
+#line 1517 "Resources.c"
 		}
 #line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1530 "Resources.c"
+#line 1521 "Resources.c"
 		{
 			gint _tmp11_ = 0;
 			GdkPixbuf* _tmp12_ = NULL;
@@ -1566,7 +1557,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp12_;
 #line 552 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1542 "Resources.c"
+#line 1533 "Resources.c"
 		}
 		default:
 		{
@@ -1574,7 +1565,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = NULL;
 #line 554 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1550 "Resources.c"
+#line 1541 "Resources.c"
 		}
 	}
 }
@@ -2210,7 +2201,7 @@ void resources_generate_rating_strings (void) {
 	_g_free0 (label_base);
 #line 558 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (menu_base);
-#line 2186 "Resources.c"
+#line 2177 "Resources.c"
 }
 
 
@@ -2232,222 +2223,58 @@ gchar* resources_jump_to_file_failed (GError* err) {
 	result = _tmp3_;
 #line 669 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2208 "Resources.c"
+#line 2199 "Resources.c"
 }
 
 
-static void _dim_pixbuf_resources_add_stock_icon_modify (GdkPixbuf* pixbuf, gpointer self) {
-#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
-	dim_pixbuf (pixbuf);
-#line 2215 "Resources.c"
+static gpointer _g_object_ref0 (gpointer self) {
+#line 691 "/home/jens/Source/shotwell/src/Resources.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 2206 "Resources.c"
 }
 
 
 void resources_init (void) {
-	GtkIconFactory* _tmp0_ = NULL;
-	GFile* icons_dir = NULL;
-	GFile* _tmp1_ = NULL;
+	GtkIconTheme* icon_theme = NULL;
+	GtkIconTheme* _tmp0_ = NULL;
+	GtkIconTheme* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
 	GFile* _tmp4_ = NULL;
 	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	GFile* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	GFile* _tmp10_ = NULL;
-	GFile* _tmp11_ = NULL;
-	GFile* _tmp12_ = NULL;
-	GFile* _tmp13_ = NULL;
-	GFile* _tmp14_ = NULL;
-	GFile* _tmp15_ = NULL;
-	GFile* _tmp16_ = NULL;
-	GFile* _tmp17_ = NULL;
-	GFile* _tmp18_ = NULL;
-	GFile* _tmp19_ = NULL;
-	GFile* _tmp20_ = NULL;
-	GFile* _tmp21_ = NULL;
-	GFile* _tmp22_ = NULL;
-	GThemedIcon* _tmp23_ = NULL;
-	GThemedIcon* _tmp24_ = NULL;
-	GThemedIcon* _tmp25_ = NULL;
-	GThemedIcon* _tmp26_ = NULL;
-	GThemedIcon* _tmp27_ = NULL;
-	GThemedIcon* _tmp28_ = NULL;
-	GThemedIcon* _tmp29_ = NULL;
-	GThemedIcon* _tmp30_ = NULL;
-	GThemedIcon* _tmp31_ = NULL;
-	GThemedIcon* _tmp32_ = NULL;
-	GThemedIcon* _tmp33_ = NULL;
-	GThemedIcon* _tmp34_ = NULL;
-	GThemedIcon* _tmp35_ = NULL;
-	GThemedIcon* _tmp36_ = NULL;
-	GThemedIcon* _tmp37_ = NULL;
-	GThemedIcon* _tmp38_ = NULL;
-	GtkIconFactory* _tmp39_ = NULL;
+	gchar* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+#line 691 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp0_ = gtk_icon_theme_get_default ();
+#line 691 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 691 "/home/jens/Source/shotwell/src/Resources.vala"
+	icon_theme = _tmp1_;
 #line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = gtk_icon_factory_new ();
+	_tmp2_ = app_dirs_get_resources_dir ();
 #line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (resources_factory);
+	_tmp3_ = _tmp2_;
 #line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_factory = _tmp0_;
-#line 695 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = app_dirs_get_resources_dir ();
-#line 695 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = _tmp1_;
-#line 695 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = g_file_get_child (_tmp2_, "icons");
-#line 695 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp4_ = _tmp3_;
-#line 695 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp2_);
-#line 695 "/home/jens/Source/shotwell/src/Resources.vala"
-	icons_dir = _tmp4_;
-#line 696 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp5_ = g_file_get_child (icons_dir, "crop.svg");
-#line 696 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp6_ = _tmp5_;
-#line 696 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon (_tmp6_, RESOURCES_CROP);
-#line 696 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp6_);
-#line 697 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp7_ = g_file_get_child (icons_dir, "redeye.png");
-#line 697 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp8_ = _tmp7_;
-#line 697 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon (_tmp8_, RESOURCES_REDEYE);
-#line 697 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp8_);
-#line 698 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp9_ = g_file_get_child (icons_dir, "make-primary.svg");
-#line 698 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp10_ = _tmp9_;
-#line 698 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon (_tmp10_, RESOURCES_MAKE_PRIMARY);
-#line 698 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp10_);
-#line 699 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp11_ = g_file_get_child (icons_dir, "import.svg");
-#line 699 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp12_ = _tmp11_;
-#line 699 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon (_tmp12_, RESOURCES_IMPORT);
-#line 699 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp12_);
-#line 700 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp13_ = g_file_get_child (icons_dir, "straighten.svg");
-#line 700 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp14_ = _tmp13_;
-#line 700 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon (_tmp14_, RESOURCES_STRAIGHTEN);
-#line 700 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp14_);
-#line 701 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp15_ = g_file_get_child (icons_dir, "import-all.png");
-#line 701 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp16_ = _tmp15_;
-#line 701 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon (_tmp16_, RESOURCES_IMPORT_ALL);
-#line 701 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp16_);
-#line 702 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp17_ = g_file_get_child (icons_dir, "shotwell-auto-enhance.png");
-#line 702 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp18_ = _tmp17_;
-#line 702 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon (_tmp18_, RESOURCES_ENHANCE);
-#line 702 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp18_);
-#line 703 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp19_ = g_file_get_child (icons_dir, "crop-pivot-reticle.png");
-#line 703 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp20_ = _tmp19_;
-#line 703 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon (_tmp20_, RESOURCES_CROP_PIVOT_RETICLE);
-#line 703 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp20_);
-#line 704 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp21_ = g_file_get_child (icons_dir, "merge.svg");
-#line 704 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp22_ = _tmp21_;
-#line 704 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon (_tmp22_, RESOURCES_MERGE);
-#line 704 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp22_);
-#line 705 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp23_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FLAGGED_PAGE);
-#line 705 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp24_ = _tmp23_;
-#line 705 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon_from_themed_icon (_tmp24_, RESOURCES_ICON_FLAGGED_PAGE, NULL, NULL);
-#line 705 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp24_);
-#line 706 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp25_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_VIDEOS_PAGE);
-#line 706 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp26_ = _tmp25_;
-#line 706 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon_from_themed_icon (_tmp26_, RESOURCES_ICON_VIDEOS_PAGE, NULL, NULL);
-#line 706 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp26_);
-#line 707 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp27_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_SINGLE_PHOTO);
-#line 707 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp28_ = _tmp27_;
-#line 707 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon_from_themed_icon (_tmp28_, RESOURCES_ICON_SINGLE_PHOTO, NULL, NULL);
-#line 707 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp28_);
-#line 708 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp29_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_CAMERAS);
-#line 708 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp30_ = _tmp29_;
-#line 708 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon_from_themed_icon (_tmp30_, RESOURCES_ICON_CAMERAS, NULL, NULL);
-#line 708 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp30_);
-#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp31_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FILTER_FLAGGED);
-#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp32_ = _tmp31_;
-#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon_from_themed_icon (_tmp32_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED, _dim_pixbuf_resources_add_stock_icon_modify, NULL);
-#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp32_);
-#line 712 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp33_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FILTER_PHOTOS);
-#line 712 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp34_ = _tmp33_;
-#line 712 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon_from_themed_icon (_tmp34_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED, _dim_pixbuf_resources_add_stock_icon_modify, NULL);
-#line 712 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp34_);
-#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp35_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FILTER_VIDEOS);
-#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp36_ = _tmp35_;
-#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon_from_themed_icon (_tmp36_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED, _dim_pixbuf_resources_add_stock_icon_modify, NULL);
-#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp36_);
-#line 716 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp37_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FILTER_RAW);
-#line 716 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp38_ = _tmp37_;
-#line 716 "/home/jens/Source/shotwell/src/Resources.vala"
-	resources_add_stock_icon_from_themed_icon (_tmp38_, RESOURCES_ICON_FILTER_RAW_DISABLED, _dim_pixbuf_resources_add_stock_icon_modify, NULL);
-#line 716 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp38_);
-#line 719 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp39_ = resources_factory;
-#line 719 "/home/jens/Source/shotwell/src/Resources.vala"
-	gtk_icon_factory_add_default (_tmp39_);
-#line 721 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp4_ = g_file_get_child (_tmp3_, "icons");
+#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp5_ = _tmp4_;
+#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp6_ = g_file_get_path (_tmp5_);
+#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp7_ = _tmp6_;
+#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
+	gtk_icon_theme_append_search_path (icon_theme, _tmp7_);
+#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp7_);
+#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_object_unref0 (_tmp5_);
+#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_object_unref0 (_tmp3_);
+#line 694 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_generate_rating_strings ();
-#line 691 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (icons_dir);
-#line 2423 "Resources.c"
+#line 690 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_object_unref0 (icon_theme);
+#line 2250 "Resources.c"
 }
 
 
@@ -2492,129 +2319,129 @@ void resources_fetch_lc_time_format (void) {
 	gchar* _tmp21_ = NULL;
 	const gchar* _tmp22_ = NULL;
 	const gchar* _tmp24_ = NULL;
-#line 740 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 713 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = g_getenv ("LANGUAGE");
-#line 740 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 713 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 740 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 713 "/home/jens/Source/shotwell/src/Resources.vala"
 	old_language = _tmp1_;
-#line 741 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = old_language;
-#line 741 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp2_ != NULL) {
-#line 742 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 715 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_unsetenv ("LANGUAGE");
-#line 2480 "Resources.c"
+#line 2307 "Resources.c"
 	}
-#line 746 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 719 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = setlocale (LC_MESSAGES, NULL);
-#line 746 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 719 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 746 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 719 "/home/jens/Source/shotwell/src/Resources.vala"
 	old_messages = _tmp4_;
-#line 747 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 720 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = setlocale (LC_TIME, NULL);
-#line 747 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 720 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 747 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 720 "/home/jens/Source/shotwell/src/Resources.vala"
 	lc_time = _tmp6_;
-#line 749 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 722 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp7_ = lc_time;
-#line 749 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 722 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp7_ != NULL) {
-#line 2498 "Resources.c"
+#line 2325 "Resources.c"
 		const gchar* _tmp8_ = NULL;
-#line 750 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 723 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = lc_time;
-#line 750 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 723 "/home/jens/Source/shotwell/src/Resources.vala"
 		setlocale (LC_MESSAGES, _tmp8_);
-#line 2504 "Resources.c"
+#line 2331 "Resources.c"
 	}
-#line 757 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 730 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_strdup ("%X");
-#line 757 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 730 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_HH_MM_FORMAT_STRING);
-#line 757 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 730 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_HH_MM_FORMAT_STRING = _tmp9_;
-#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 735 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = nl_langinfo (T_FMT);
-#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 735 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = g_strdup (_tmp10_);
-#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 735 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_HH_MM_SS_FORMAT_STRING);
-#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 735 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_HH_MM_SS_FORMAT_STRING = _tmp11_;
-#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 739 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = _ ("%a %b %d, %Y");
-#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 739 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp13_ = g_strdup (_tmp12_);
-#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 739 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_LONG_DATE_FORMAT_STRING);
-#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 739 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_LONG_DATE_FORMAT_STRING = _tmp13_;
-#line 771 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 744 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp14_ = C_ ("MultidayFormat", "%a %b %d");
-#line 771 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 744 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp15_ = g_strdup (_tmp14_);
-#line 771 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 744 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_START_MULTIDAY_DATE_FORMAT_STRING);
-#line 771 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 744 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_START_MULTIDAY_DATE_FORMAT_STRING = _tmp15_;
-#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 749 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp16_ = C_ ("MultidayFormat", "%d, %Y");
-#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 749 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp17_ = g_strdup (_tmp16_);
-#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 749 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_END_MULTIDAY_DATE_FORMAT_STRING);
-#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 749 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_END_MULTIDAY_DATE_FORMAT_STRING = _tmp17_;
-#line 781 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 754 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp18_ = C_ ("MultimonthFormat", "%a %b %d");
-#line 781 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 754 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp19_ = g_strdup (_tmp18_);
-#line 781 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 754 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_START_MULTIMONTH_DATE_FORMAT_STRING);
-#line 781 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 754 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_START_MULTIMONTH_DATE_FORMAT_STRING = _tmp19_;
-#line 786 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 759 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp20_ = C_ ("MultimonthFormat", "%a %b %d, %Y");
-#line 786 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 759 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp21_ = g_strdup (_tmp20_);
-#line 786 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 759 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_END_MULTIMONTH_DATE_FORMAT_STRING);
-#line 786 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 759 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_END_MULTIMONTH_DATE_FORMAT_STRING = _tmp21_;
-#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = old_messages;
-#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp22_ != NULL) {
-#line 2564 "Resources.c"
+#line 2391 "Resources.c"
 		const gchar* _tmp23_ = NULL;
-#line 790 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 763 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp23_ = old_messages;
-#line 790 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 763 "/home/jens/Source/shotwell/src/Resources.vala"
 		setlocale (LC_MESSAGES, _tmp23_);
-#line 2570 "Resources.c"
+#line 2397 "Resources.c"
 	}
-#line 793 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp24_ = old_language;
-#line 793 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp24_ != NULL) {
-#line 2576 "Resources.c"
+#line 2403 "Resources.c"
 		const gchar* _tmp25_ = NULL;
-#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 767 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25_ = old_language;
-#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 767 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_setenv ("LANGUAGE", _tmp25_, TRUE);
-#line 2582 "Resources.c"
+#line 2409 "Resources.c"
 	}
-#line 737 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (lc_time);
-#line 737 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (old_messages);
-#line 737 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (old_language);
-#line 2590 "Resources.c"
+#line 2417 "Resources.c"
 }
 
 
@@ -2627,23 +2454,23 @@ gchar* resources_get_hh_mm_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 803 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_HH_MM_FORMAT_STRING;
-#line 803 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 777 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2609 "Resources.c"
+#line 2436 "Resources.c"
 	}
-#line 807 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 780 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_HH_MM_FORMAT_STRING;
-#line 807 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 780 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 807 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 780 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 807 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 780 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2619 "Resources.c"
+#line 2446 "Resources.c"
 }
 
 
@@ -2652,23 +2479,23 @@ gchar* resources_get_hh_mm_ss_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 811 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_HH_MM_SS_FORMAT_STRING;
-#line 811 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 785 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2634 "Resources.c"
+#line 2461 "Resources.c"
 	}
-#line 815 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_HH_MM_SS_FORMAT_STRING;
-#line 815 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 815 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 815 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2644 "Resources.c"
+#line 2471 "Resources.c"
 }
 
 
@@ -2677,23 +2504,23 @@ gchar* resources_get_long_date_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 819 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_LONG_DATE_FORMAT_STRING;
-#line 819 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 793 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2659 "Resources.c"
+#line 2486 "Resources.c"
 	}
-#line 823 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 796 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_LONG_DATE_FORMAT_STRING;
-#line 823 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 796 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 823 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 796 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 823 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 796 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2669 "Resources.c"
+#line 2496 "Resources.c"
 }
 
 
@@ -2702,23 +2529,23 @@ gchar* resources_get_start_multiday_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 827 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 800 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_START_MULTIDAY_DATE_FORMAT_STRING;
-#line 827 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 800 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 801 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2684 "Resources.c"
+#line 2511 "Resources.c"
 	}
-#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_START_MULTIDAY_DATE_FORMAT_STRING;
-#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2694 "Resources.c"
+#line 2521 "Resources.c"
 }
 
 
@@ -2727,23 +2554,23 @@ gchar* resources_get_end_multiday_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 835 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 808 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_END_MULTIDAY_DATE_FORMAT_STRING;
-#line 835 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 808 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 836 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 809 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2709 "Resources.c"
+#line 2536 "Resources.c"
 	}
-#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_END_MULTIDAY_DATE_FORMAT_STRING;
-#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2719 "Resources.c"
+#line 2546 "Resources.c"
 }
 
 
@@ -2752,23 +2579,23 @@ gchar* resources_get_start_multimonth_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 843 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 816 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING;
-#line 843 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 816 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 844 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 817 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2734 "Resources.c"
+#line 2561 "Resources.c"
 	}
-#line 847 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING;
-#line 847 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 847 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 847 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2744 "Resources.c"
+#line 2571 "Resources.c"
 }
 
 
@@ -2777,23 +2604,23 @@ gchar* resources_get_end_multimonth_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 824 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING;
-#line 851 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 824 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 852 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 825 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2759 "Resources.c"
+#line 2586 "Resources.c"
 	}
-#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING;
-#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2769 "Resources.c"
+#line 2596 "Resources.c"
 }
 
 
@@ -2806,38 +2633,31 @@ GFile* resources_get_ui (const gchar* filename) {
 	const gchar* _tmp4_ = NULL;
 	GFile* _tmp5_ = NULL;
 	GFile* _tmp6_ = NULL;
-#line 858 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = app_dirs_get_resources_dir ();
-#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _tmp0_;
-#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "ui");
-#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_;
-#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = filename;
-#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = g_file_get_child (_tmp3_, _tmp4_);
-#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = _tmp5_;
-#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp3_);
-#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp1_);
-#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp6_;
-#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2806 "Resources.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 2813 "Resources.c"
+#line 2633 "Resources.c"
 }
 
 
@@ -2847,11 +2667,11 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 	GdkPixbuf* _tmp14_ = NULL;
 	GdkPixbuf* _tmp15_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_noninterpretable_badge_pixbuf;
-#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 2827 "Resources.c"
+#line 2647 "Resources.c"
 		{
 			GdkPixbuf* _tmp1_ = NULL;
 			GFile* _tmp2_ = NULL;
@@ -2865,92 +2685,92 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			GdkPixbuf* _tmp10_ = NULL;
 			GdkPixbuf* _tmp11_ = NULL;
 			GdkPixbuf* _tmp12_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = app_dirs_get_resources_dir ();
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = _tmp2_;
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = g_file_get_child (_tmp3_, "icons");
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = _tmp4_;
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = g_file_get_child (_tmp5_, RESOURCES_NONINTERPRETABLE_BADGE_FILE);
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = _tmp6_;
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = g_file_get_path (_tmp7_);
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = _tmp8_;
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = gdk_pixbuf_new_from_file (_tmp9_, &_inner_error_);
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = _tmp10_;
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (_tmp9_);
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (_tmp7_);
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (_tmp5_);
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (_tmp3_);
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = _tmp11_;
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2873 "Resources.c"
+#line 2693 "Resources.c"
 				goto __catch426_g_error;
 			}
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = _tmp1_;
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (resources_noninterpretable_badge_pixbuf);
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
 			resources_noninterpretable_badge_pixbuf = _tmp12_;
-#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (_tmp1_);
-#line 2886 "Resources.c"
+#line 2706 "Resources.c"
 		}
 		goto __finally426;
 		__catch426_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp13_ = NULL;
-#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
 			err = _inner_error_;
-#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
 			_inner_error_ = NULL;
-#line 871 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 844 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp13_ = err->message;
-#line 871 "/home/jens/Source/shotwell/src/Resources.vala"
-			g_error ("Resources.vala:871: VideoReader can't load noninterpretable badge imag" \
+#line 844 "/home/jens/Source/shotwell/src/Resources.vala"
+			g_error ("Resources.vala:844: VideoReader can't load noninterpretable badge imag" \
 "e: %s", _tmp13_);
-#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_error_free0 (err);
-#line 2903 "Resources.c"
+#line 2723 "Resources.c"
 		}
 		__finally426:
-#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_critical ("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 867 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_clear_error (&_inner_error_);
-#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
 			return NULL;
-#line 2914 "Resources.c"
+#line 2734 "Resources.c"
 		}
 	}
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 848 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp14_ = resources_noninterpretable_badge_pixbuf;
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 848 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 848 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp15_;
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 848 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2925 "Resources.c"
+#line 2745 "Resources.c"
 }
 
 
@@ -2965,37 +2785,37 @@ GtkIconTheme* resources_get_icon_theme_engine (void) {
 	GFile* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 852 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
-#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 852 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 852 "/home/jens/Source/shotwell/src/Resources.vala"
 	icon_theme = _tmp1_;
-#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = app_dirs_get_resources_dir ();
-#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_;
-#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = g_file_get_child (_tmp3_, "icons");
-#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _tmp4_;
-#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = g_file_get_path (_tmp5_);
-#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp7_ = _tmp6_;
-#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
 	gtk_icon_theme_append_search_path (icon_theme, _tmp7_);
-#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp7_);
-#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp5_);
-#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp3_);
-#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = icon_theme;
-#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2970 "Resources.c"
+#line 2790 "Resources.c"
 }
 
 
@@ -3020,13 +2840,13 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 	gchar* _tmp31_ = NULL;
 	gchar* _tmp32_ = NULL;
 	GdkPixbuf* _tmp33_ = NULL;
-#line 887 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 860 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 861 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_scaled_icon_cache;
-#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 861 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ != NULL) {
-#line 3001 "Resources.c"
+#line 2821 "Resources.c"
 		gchar* scaled_name = NULL;
 		const gchar* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
@@ -3034,162 +2854,162 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 		GeeHashMap* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 889 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = name;
-#line 889 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = scale;
-#line 889 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp3_ = g_strdup_printf ("%s-%d", _tmp1_, _tmp2_);
-#line 889 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 		scaled_name = _tmp3_;
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp4_ = resources_scaled_icon_cache;
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = scaled_name;
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp6_) {
-#line 3025 "Resources.c"
+#line 2845 "Resources.c"
 			GeeHashMap* _tmp7_ = NULL;
 			const gchar* _tmp8_ = NULL;
 			gpointer _tmp9_ = NULL;
-#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = resources_scaled_icon_cache;
-#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = scaled_name;
-#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_);
-#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = (GdkPixbuf*) _tmp9_;
-#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (scaled_name);
-#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 3041 "Resources.c"
+#line 2861 "Resources.c"
 		}
-#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 861 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (scaled_name);
-#line 3045 "Resources.c"
+#line 2865 "Resources.c"
 	}
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 869 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = resources_icon_cache;
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 869 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp10_ == NULL) {
-#line 3051 "Resources.c"
+#line 2871 "Resources.c"
 		GeeHashMap* _tmp11_ = NULL;
-#line 897 "/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);
-#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 870 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+#line 870 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_icon_cache);
-#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 870 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_icon_cache = _tmp11_;
-#line 3059 "Resources.c"
+#line 2879 "Resources.c"
 	}
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = resources_icon_cache;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp13_ = name;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_);
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
 	pixbuf = (GdkPixbuf*) _tmp14_;
-#line 901 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp15_ = pixbuf;
-#line 901 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp15_ == NULL) {
-#line 3073 "Resources.c"
+#line 2893 "Resources.c"
 		const gchar* _tmp16_ = NULL;
 		GdkPixbuf* _tmp17_ = NULL;
 		GdkPixbuf* _tmp18_ = NULL;
 		GeeHashMap* _tmp19_ = NULL;
 		const gchar* _tmp20_ = NULL;
 		GdkPixbuf* _tmp21_ = NULL;
-#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = name;
-#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp17_ = resources_load_icon (_tmp16_, 0);
-#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
 		pixbuf = _tmp17_;
-#line 903 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp18_ = pixbuf;
-#line 903 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp18_ == NULL) {
-#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 877 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = NULL;
-#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 877 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (pixbuf);
-#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 877 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 3098 "Resources.c"
+#line 2918 "Resources.c"
 		}
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = resources_icon_cache;
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp20_ = name;
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21_ = pixbuf;
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, _tmp21_);
-#line 3108 "Resources.c"
+#line 2928 "Resources.c"
 	}
-#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = scale;
-#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp22_ <= 0) {
-#line 910 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = pixbuf;
-#line 910 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3118 "Resources.c"
+#line 2938 "Resources.c"
 	}
-#line 912 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 885 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp23_ = pixbuf;
-#line 912 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 885 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp24_ = scale;
-#line 912 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 885 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp25_ = scale_pixbuf (_tmp23_, _tmp24_, GDK_INTERP_BILINEAR, FALSE);
-#line 912 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 885 "/home/jens/Source/shotwell/src/Resources.vala"
 	scaled_pixbuf = _tmp25_;
-#line 914 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 887 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp26_ = resources_scaled_icon_cache;
-#line 914 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 887 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp26_ == NULL) {
-#line 3132 "Resources.c"
+#line 2952 "Resources.c"
 		GeeHashMap* _tmp27_ = NULL;
-#line 915 "/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);
-#line 915 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_scaled_icon_cache);
-#line 915 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_scaled_icon_cache = _tmp27_;
-#line 3140 "Resources.c"
+#line 2960 "Resources.c"
 	}
-#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp28_ = resources_scaled_icon_cache;
-#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp29_ = name;
-#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp30_ = scale;
-#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp31_ = g_strdup_printf ("%s-%d", _tmp29_, _tmp30_);
-#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp32_ = _tmp31_;
-#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp33_ = scaled_pixbuf;
-#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp32_, _tmp33_);
-#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp32_);
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 892 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = scaled_pixbuf;
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 892 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (pixbuf);
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 892 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3164 "Resources.c"
+#line 2984 "Resources.c"
 }
 
 
@@ -3205,23 +3025,23 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 	GdkPixbuf* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	GError * _inner_error_ = NULL;
-#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 923 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = app_dirs_get_resources_dir ();
-#line 923 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _tmp0_;
-#line 923 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "icons");
-#line 923 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_;
-#line 923 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp1_);
-#line 923 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 	icons_dir = _tmp3_;
-#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 	pixbuf = NULL;
-#line 3196 "Resources.c"
+#line 3016 "Resources.c"
 	{
 		GdkPixbuf* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
@@ -3232,42 +3052,42 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		GdkPixbuf* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
 		GdkPixbuf* _tmp12_ = NULL;
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = name;
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = g_file_get_child (icons_dir, _tmp5_);
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = _tmp6_;
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = g_file_get_path (_tmp7_);
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = _tmp8_;
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = gdk_pixbuf_new_from_file (_tmp9_, &_inner_error_);
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = _tmp10_;
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp9_);
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp7_);
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp4_ = _tmp11_;
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3229 "Resources.c"
+#line 3049 "Resources.c"
 			goto __catch427_g_error;
 		}
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = _tmp4_;
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp4_ = NULL;
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 		pixbuf = _tmp12_;
-#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp4_);
-#line 3242 "Resources.c"
+#line 3062 "Resources.c"
 	}
 	goto __finally427;
 	__catch427_g_error:
@@ -3276,383 +3096,92 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		const gchar* _tmp13_ = NULL;
 		GError* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
-#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
 		err = _inner_error_;
-#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
 		_inner_error_ = NULL;
-#line 929 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = name;
-#line 929 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = err;
-#line 929 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp15_ = _tmp14_->message;
-#line 929 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_critical ("Resources.vala:929: Unable to load icon %s: %s", _tmp13_, _tmp15_);
-#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_critical ("Resources.vala:902: Unable to load icon %s: %s", _tmp13_, _tmp15_);
+#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_error_free0 (err);
-#line 3265 "Resources.c"
+#line 3085 "Resources.c"
 	}
 	__finally427:
-#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (icons_dir);
-#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_critical ("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 926 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_clear_error (&_inner_error_);
-#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
 		return NULL;
-#line 3280 "Resources.c"
+#line 3100 "Resources.c"
 	}
-#line 932 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 905 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp16_ = pixbuf;
-#line 932 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 905 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp16_ == NULL) {
-#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = NULL;
-#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (icons_dir);
-#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3294 "Resources.c"
+#line 3114 "Resources.c"
 	}
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp18_ = scale;
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp18_ > 0) {
-#line 3300 "Resources.c"
+#line 3120 "Resources.c"
 		GdkPixbuf* _tmp19_ = NULL;
 		gint _tmp20_ = 0;
 		GdkPixbuf* _tmp21_ = NULL;
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = pixbuf;
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp20_ = scale;
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21_ = scale_pixbuf (_tmp19_, _tmp20_, GDK_INTERP_BILINEAR, FALSE);
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp17_);
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp17_ = _tmp21_;
-#line 3314 "Resources.c"
+#line 3134 "Resources.c"
 	} else {
 		GdkPixbuf* _tmp22_ = NULL;
 		GdkPixbuf* _tmp23_ = NULL;
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp22_ = pixbuf;
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp17_);
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp17_ = _tmp23_;
-#line 3326 "Resources.c"
+#line 3146 "Resources.c"
 	}
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp17_;
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (pixbuf);
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (icons_dir);
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3336 "Resources.c"
-}
-
-
-void resources_add_stock_icon (GFile* file, const gchar* stock_id) {
-	GdkPixbuf* pixbuf = NULL;
-	GtkIconSet* icon_set = NULL;
-	GdkPixbuf* _tmp10_ = NULL;
-	GtkIconSet* _tmp11_ = NULL;
-	GtkIconFactory* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_if_fail (G_IS_FILE (file));
-#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_if_fail (stock_id != NULL);
-#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
-	pixbuf = NULL;
-#line 3354 "Resources.c"
-	{
-		GdkPixbuf* _tmp0_ = NULL;
-		GFile* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
-		GdkPixbuf* _tmp5_ = NULL;
-		GdkPixbuf* _tmp6_ = NULL;
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp1_ = file;
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp2_ = g_file_get_path (_tmp1_);
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp3_ = _tmp2_;
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp4_ = gdk_pixbuf_new_from_file (_tmp3_, &_inner_error_);
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp5_ = _tmp4_;
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_free0 (_tmp3_);
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp0_ = _tmp5_;
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3379 "Resources.c"
-			goto __catch428_g_error;
-		}
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp6_ = _tmp0_;
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp0_ = NULL;
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (pixbuf);
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
-		pixbuf = _tmp6_;
-#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (_tmp0_);
-#line 3392 "Resources.c"
-	}
-	goto __finally428;
-	__catch428_g_error:
-	{
-		GError* err = NULL;
-		const gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
-		err = _inner_error_;
-#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
-		_inner_error_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp7_ = stock_id;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp8_ = err;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp9_ = _tmp8_->message;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_critical ("Resources.vala:943: Unable to load stock icon %s: %s", _tmp7_, _tmp9_);
-#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_error_free0 (err);
-#line 3415 "Resources.c"
-	}
-	__finally428:
-#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (pixbuf);
-#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_critical ("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 940 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_clear_error (&_inner_error_);
-#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
-		return;
-#line 3428 "Resources.c"
-	}
-#line 946 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp10_ = pixbuf;
-#line 946 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp11_ = gtk_icon_set_new_from_pixbuf (_tmp10_);
-#line 946 "/home/jens/Source/shotwell/src/Resources.vala"
-	icon_set = _tmp11_;
-#line 947 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp12_ = resources_factory;
-#line 947 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp13_ = stock_id;
-#line 947 "/home/jens/Source/shotwell/src/Resources.vala"
-	gtk_icon_factory_add (_tmp12_, _tmp13_, icon_set);
-#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
-	_gtk_icon_set_unref0 (icon_set);
-#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (pixbuf);
-#line 3446 "Resources.c"
-}
-
-
-void resources_add_stock_icon_from_themed_icon (GThemedIcon* gicon, const gchar* stock_id, ResourcesAddStockIconModify modify, void* modify_target) {
-	GtkIconTheme* icon_theme = NULL;
-	GtkIconTheme* _tmp0_ = NULL;
-	GtkIconTheme* _tmp1_ = NULL;
-	GtkIconTheme* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GtkIconInfo* info = NULL;
-	GtkIconTheme* _tmp9_ = NULL;
-	GThemedIcon* _tmp10_ = NULL;
-	GtkIconInfo* _tmp11_ = NULL;
-	GtkIconInfo* _tmp12_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_if_fail (G_IS_THEMED_ICON (gicon));
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_if_fail (stock_id != NULL);
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = gtk_icon_theme_get_default ();
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
-	icon_theme = _tmp1_;
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = icon_theme;
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = app_dirs_get_resources_dir ();
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp4_ = _tmp3_;
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp5_ = g_file_get_child (_tmp4_, "icons");
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp6_ = _tmp5_;
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp7_ = g_file_get_path (_tmp6_);
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp8_ = _tmp7_;
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	gtk_icon_theme_append_search_path (_tmp2_, _tmp8_);
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp8_);
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp6_);
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp4_);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp9_ = icon_theme;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp10_ = gicon;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp11_ = gtk_icon_theme_lookup_by_gicon (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_icon_get_type (), GIcon), RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
-	info = _tmp11_;
-#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp12_ = info;
-#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (_tmp12_ == NULL) {
-#line 3511 "Resources.c"
-		const gchar* _tmp13_ = NULL;
-#line 960 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp13_ = stock_id;
-#line 960 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_debug ("Resources.vala:960: unable to load icon for: %s", _tmp13_);
-#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
-		_gtk_icon_info_free0 (info);
-#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (icon_theme);
-#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
-		return;
-#line 3523 "Resources.c"
-	}
-	{
-		GdkPixbuf* pix = NULL;
-		GtkIconInfo* _tmp14_ = NULL;
-		GdkPixbuf* _tmp15_ = NULL;
-		ResourcesAddStockIconModify _tmp16_ = NULL;
-		void* _tmp16__target = NULL;
-		GtkIconSet* icon_set = NULL;
-		GdkPixbuf* _tmp19_ = NULL;
-		GtkIconSet* _tmp20_ = NULL;
-		GtkIconFactory* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-		GtkIconSet* _tmp23_ = NULL;
-#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp14_ = info;
-#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp15_ = gtk_icon_info_load_icon (_tmp14_, &_inner_error_);
-#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
-		pix = _tmp15_;
-#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3545 "Resources.c"
-			goto __catch429_g_error;
-		}
-#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp16_ = modify;
-#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp16__target = modify_target;
-#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
-		if (_tmp16_ != NULL) {
-#line 3554 "Resources.c"
-			ResourcesAddStockIconModify _tmp17_ = NULL;
-			void* _tmp17__target = NULL;
-			GdkPixbuf* _tmp18_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp17_ = modify;
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp17__target = modify_target;
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp18_ = pix;
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp17_ (_tmp18_, _tmp17__target);
-#line 3566 "Resources.c"
-		}
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp19_ = pix;
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp20_ = gtk_icon_set_new_from_pixbuf (_tmp19_);
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
-		icon_set = _tmp20_;
-#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp21_ = resources_factory;
-#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp22_ = stock_id;
-#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp23_ = icon_set;
-#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
-		gtk_icon_factory_add (_tmp21_, _tmp22_, _tmp23_);
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
-		_gtk_icon_set_unref0 (icon_set);
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (pix);
-#line 3586 "Resources.c"
-	}
-	goto __finally429;
-	__catch429_g_error:
-	{
-		GError* err = NULL;
-		GError* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
-		err = _inner_error_;
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
-		_inner_error_ = NULL;
-#line 972 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp24_ = err;
-#line 972 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp25_ = _tmp24_->message;
-#line 972 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_debug ("Resources.vala:972: %s", _tmp25_);
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_error_free0 (err);
-#line 3606 "Resources.c"
-	}
-	__finally429:
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
-		_gtk_icon_info_free0 (info);
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (icon_theme);
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_critical ("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 964 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_clear_error (&_inner_error_);
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
-		return;
-#line 3621 "Resources.c"
-	}
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
-	_gtk_icon_info_free0 (info);
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (icon_theme);
-#line 3627 "Resources.c"
+#line 3156 "Resources.c"
 }
 
 
@@ -3670,88 +3199,88 @@ gchar* resources_get_help_path (void) {
 	GFile* _tmp7_ = NULL;
 	GFile* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
-#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = app_dirs_get_exec_dir ();
-#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _tmp0_;
-#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "help");
-#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_;
-#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = g_file_get_child (_tmp3_, "C");
-#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _tmp4_;
-#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp3_);
-#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp1_);
-#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	help_dir = _tmp5_;
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 920 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = help_dir;
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 920 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp7_ = g_file_get_child (_tmp6_, "index.page");
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 920 "/home/jens/Source/shotwell/src/Resources.vala"
 	help_index = _tmp7_;
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp8_ = help_index;
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_file_query_exists (_tmp8_, NULL);
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp9_) {
-#line 3675 "Resources.c"
+#line 3204 "Resources.c"
 		gchar* help_path = NULL;
 		GFile* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = help_dir;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = g_file_get_path (_tmp10_);
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (help_path);
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
 		help_path = _tmp11_;
-#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = help_path;
-#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = g_str_has_suffix (_tmp12_, "/");
-#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (!_tmp13_) {
-#line 3695 "Resources.c"
+#line 3224 "Resources.c"
 			const gchar* _tmp14_ = NULL;
 			gchar* _tmp15_ = NULL;
-#line 993 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp14_ = help_path;
-#line 993 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp15_ = g_strconcat (_tmp14_, "/", NULL);
-#line 993 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 993 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
 			help_path = _tmp15_;
-#line 3706 "Resources.c"
+#line 3235 "Resources.c"
 		}
-#line 996 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = help_path;
-#line 996 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (help_index);
-#line 996 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (help_dir);
-#line 996 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3716 "Resources.c"
+#line 3245 "Resources.c"
 	}
-#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 937 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 937 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (help_index);
-#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 937 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (help_dir);
-#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 937 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3726 "Resources.c"
+#line 3255 "Resources.c"
 }
 
 
@@ -3761,17 +3290,17 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp27_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (GDK_IS_SCREEN (screen));
-#line 1006 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_get_help_path ();
-#line 1006 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	help_path = _tmp0_;
-#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = help_path;
-#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp1_ != NULL) {
-#line 3746 "Resources.c"
+#line 3275 "Resources.c"
 		const gchar* _tmp2_ = NULL;
 		gchar** argv = NULL;
 		gchar** _tmp6_ = NULL;
@@ -3803,179 +3332,179 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 		gchar** _tmp25_ = NULL;
 		gint _tmp25__length1 = 0;
 		const gchar* _tmp26_ = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 947 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = anchor;
-#line 1012 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 947 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp2_ != NULL) {
-#line 3782 "Resources.c"
+#line 3311 "Resources.c"
 			const gchar* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
 			gchar* _tmp5_ = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = help_path;
-#line 1013 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = anchor;
-#line 1013 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = g_strconcat (_tmp3_, _tmp4_, NULL);
-#line 1013 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 1013 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
 			help_path = _tmp5_;
-#line 3796 "Resources.c"
+#line 3325 "Resources.c"
 		}
-#line 1016 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = g_new0 (gchar*, 3 + 1);
-#line 1016 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv = _tmp6_;
-#line 1016 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv_length1 = 3;
-#line 1016 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
 		_argv_size_ = argv_length1;
-#line 1017 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = argv;
-#line 1017 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7__length1 = argv_length1;
-#line 1017 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = g_strdup ("yelp");
-#line 1017 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp7_[0]);
-#line 1017 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_[0] = _tmp8_;
-#line 1017 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = _tmp7_[0];
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = argv;
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10__length1 = argv_length1;
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = help_path;
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = g_strdup (_tmp11_);
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp10_[1]);
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_[1] = _tmp12_;
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = _tmp10_[1];
-#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = argv;
-#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14__length1 = argv_length1;
-#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp14_[2]);
-#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_[2] = NULL;
-#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp15_ = _tmp14_[2];
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp17_ = app_dirs_get_exec_dir ();
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp18_ = _tmp17_;
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = g_file_get_path (_tmp18_);
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp20_ = _tmp19_;
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21_ = argv;
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21__length1 = argv_length1;
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp23_ = g_spawn_async (_tmp20_, _tmp21_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &_tmp22_, &_inner_error_);
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		pid = _tmp22_;
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp24_ = _tmp23_;
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp20_);
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = _tmp24_;
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 			argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3876 "Resources.c"
+#line 3405 "Resources.c"
 		}
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp16_) {
-#line 1024 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
 			argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 1024 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 1024 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3886 "Resources.c"
+#line 3415 "Resources.c"
 		}
-#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25_ = argv;
-#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25__length1 = argv_length1;
-#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp26_ = _tmp25_[0];
-#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_warning ("Resources.vala:1027: Unable to launch %s", _tmp26_);
-#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_warning ("Resources.vala:962: Unable to launch %s", _tmp26_);
+#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 3898 "Resources.c"
+#line 3427 "Resources.c"
 	}
-#line 1031 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp27_ = anchor;
-#line 1031 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp27_ != NULL) {
-#line 3904 "Resources.c"
+#line 3433 "Resources.c"
 		GdkScreen* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp28_ = screen;
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp29_ = anchor;
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp30_ = g_strconcat ("help:shotwell", _tmp29_, NULL);
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp31_ = _tmp30_;
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 		sys_show_uri (_tmp28_, _tmp31_, &_inner_error_);
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp31_);
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3929 "Resources.c"
+#line 3458 "Resources.c"
 		}
 	} else {
 		GdkScreen* _tmp32_ = NULL;
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp32_ = screen;
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
 		sys_show_uri (_tmp32_, "help:shotwell", &_inner_error_);
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3945 "Resources.c"
+#line 3474 "Resources.c"
 		}
 	}
-#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (help_path);
-#line 3950 "Resources.c"
+#line 3479 "Resources.c"
 }
 
 
@@ -3991,33 +3520,33 @@ gchar* resources_to_css_color (GdkRGBA* color) {
 	GdkRGBA _tmp4_ = {0};
 	gdouble _tmp5_ = 0.0;
 	gchar* _tmp6_ = NULL;
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 973 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (color != NULL, NULL);
-#line 1039 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = *color;
-#line 1039 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _tmp0_.red;
-#line 1039 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
 	r = (gint) (_tmp1_ * 255);
-#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = *color;
-#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_.green;
-#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
 	g = (gint) (_tmp3_ * 255);
-#line 1041 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = *color;
-#line 1041 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _tmp4_.blue;
-#line 1041 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
 	b = (gint) (_tmp5_ * 255);
-#line 1043 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 978 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = g_strdup_printf ("rgb(%d, %d, %d)", r, g, b);
-#line 1043 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 978 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp6_;
-#line 1043 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 978 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3992 "Resources.c"
+#line 3521 "Resources.c"
 }
 
 
@@ -4035,136 +3564,136 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 	GtkWidget* _tmp21_ = NULL;
 	GtkCssProvider* _tmp22_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (stylesheet != NULL);
-#line 1051 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_providers;
-#line 1051 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 4018 "Resources.c"
+#line 3547 "Resources.c"
 		GeeHashMap* _tmp1_ = NULL;
-#line 1052 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/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);
-#line 1052 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_providers);
-#line 1052 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_providers = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap);
-#line 4026 "Resources.c"
+#line 3555 "Resources.c"
 	}
-#line 1054 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = resources_providers;
-#line 1054 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = widget;
-#line 1054 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = gee_map_has_key (_tmp2_, _tmp3_);
-#line 1054 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp4_) {
-#line 4036 "Resources.c"
+#line 3565 "Resources.c"
 		GtkWidget* _tmp5_ = NULL;
 		GtkStyleContext* _tmp6_ = NULL;
 		GeeMap* _tmp7_ = NULL;
 		GtkWidget* _tmp8_ = NULL;
 		gpointer _tmp9_ = NULL;
 		GtkCssProvider* _tmp10_ = NULL;
-#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = widget;
-#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = gtk_widget_get_style_context (_tmp5_);
-#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = resources_providers;
-#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = widget;
-#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = gee_map_get (_tmp7_, _tmp8_);
-#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = (GtkCssProvider*) _tmp9_;
-#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		gtk_style_context_remove_provider (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider));
-#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp10_);
-#line 4059 "Resources.c"
+#line 3588 "Resources.c"
 	}
-#line 1057 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = gtk_css_provider_new ();
-#line 1057 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 	styler = _tmp11_;
-#line 4065 "Resources.c"
+#line 3594 "Resources.c"
 	{
 		GtkCssProvider* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
-#line 1060 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = styler;
-#line 1060 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = stylesheet;
-#line 1060 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		gtk_css_provider_load_from_data (_tmp12_, _tmp13_, (gssize) RESOURCES_ALL_DATA, &_inner_error_);
-#line 1060 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4077 "Resources.c"
-			goto __catch430_g_error;
+#line 3606 "Resources.c"
+			goto __catch428_g_error;
 		}
 	}
-	goto __finally430;
-	__catch430_g_error:
+	goto __finally428;
+	__catch428_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp14_ = NULL;
 		GError* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
-#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
 		e = _inner_error_;
-#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
 		_inner_error_ = NULL;
-#line 1062 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = stylesheet;
-#line 1062 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp15_ = e;
-#line 1062 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = _tmp15_->message;
-#line 1062 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_warning ("Resources.vala:1062: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_);
-#line 1066 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_warning ("Resources.vala:997: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_);
+#line 1001 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_error_free0 (e);
-#line 1066 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (styler);
-#line 1066 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 4106 "Resources.c"
+#line 3635 "Resources.c"
 	}
-	__finally430:
-#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
+	__finally428:
+#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (styler);
-#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_critical ("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 1059 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_clear_error (&_inner_error_);
-#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 4119 "Resources.c"
+#line 3648 "Resources.c"
 	}
-#line 1069 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp17_ = widget;
-#line 1069 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp18_ = gtk_widget_get_style_context (_tmp17_);
-#line 1069 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp19_ = styler;
-#line 1069 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
 	gtk_style_context_add_provider (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-#line 1072 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp20_ = resources_providers;
-#line 1072 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp21_ = widget;
-#line 1072 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = styler;
-#line 1072 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 	gee_map_set (_tmp20_, _tmp21_, _tmp22_);
-#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (styler);
-#line 4139 "Resources.c"
+#line 3668 "Resources.c"
 }
 
 
diff --git a/src/Resources.vala b/src/Resources.vala
index bf34ae0..d7f237c 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -676,7 +676,6 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string SELECT_ALL_MENU = _("Select _All");
     public const string SELECT_ALL_TOOLTIP = _("Select all items");
     
-    private Gtk.IconFactory factory = null;
     private Gee.HashMap<string, Gdk.Pixbuf> icon_cache = null;
     Gee.HashMap<string, Gdk.Pixbuf> scaled_icon_cache = null;
     
@@ -689,35 +688,9 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     private string END_MULTIMONTH_DATE_FORMAT_STRING = null;
         
     public void init () {
+        var icon_theme = Gtk.IconTheme.get_default();
         // load application-wide stock icons as IconSets
-        factory = new Gtk.IconFactory();
-
-        File icons_dir = AppDirs.get_resources_dir().get_child("icons");
-        add_stock_icon(icons_dir.get_child("crop.svg"), CROP);
-        add_stock_icon(icons_dir.get_child("redeye.png"), REDEYE);
-        add_stock_icon(icons_dir.get_child("make-primary.svg"), MAKE_PRIMARY);
-        add_stock_icon(icons_dir.get_child("import.svg"), IMPORT);
-        add_stock_icon(icons_dir.get_child("straighten.svg"), STRAIGHTEN);
-        add_stock_icon(icons_dir.get_child("import-all.png"), IMPORT_ALL);
-        add_stock_icon(icons_dir.get_child("shotwell-auto-enhance.png"), ENHANCE);
-        add_stock_icon(icons_dir.get_child("crop-pivot-reticle.png"), CROP_PIVOT_RETICLE);
-        add_stock_icon(icons_dir.get_child("merge.svg"), MERGE);
-        add_stock_icon_from_themed_icon(new GLib.ThemedIcon(ICON_FLAGGED_PAGE), ICON_FLAGGED_PAGE);
-        add_stock_icon_from_themed_icon(new GLib.ThemedIcon(ICON_VIDEOS_PAGE), ICON_VIDEOS_PAGE);
-        add_stock_icon_from_themed_icon(new GLib.ThemedIcon(ICON_SINGLE_PHOTO), ICON_SINGLE_PHOTO);
-        add_stock_icon_from_themed_icon(new GLib.ThemedIcon(ICON_CAMERAS), ICON_CAMERAS);
-        
-        add_stock_icon_from_themed_icon(new GLib.ThemedIcon(ICON_FILTER_FLAGGED), 
-            ICON_FILTER_FLAGGED_DISABLED, dim_pixbuf);
-        add_stock_icon_from_themed_icon(new GLib.ThemedIcon(ICON_FILTER_PHOTOS), 
-            ICON_FILTER_PHOTOS_DISABLED, dim_pixbuf);
-        add_stock_icon_from_themed_icon(new GLib.ThemedIcon(ICON_FILTER_VIDEOS), 
-            ICON_FILTER_VIDEOS_DISABLED, dim_pixbuf);
-        add_stock_icon_from_themed_icon(new GLib.ThemedIcon(ICON_FILTER_RAW), 
-            ICON_FILTER_RAW_DISABLED, dim_pixbuf);
-        
-        factory.add_default();
-
+        icon_theme.append_search_path(AppDirs.get_resources_dir().get_child("icons").get_path());
         generate_rating_strings();
     }
     
@@ -935,44 +908,6 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         return (scale > 0) ? scale_pixbuf(pixbuf, scale, Gdk.InterpType.BILINEAR, false) : pixbuf;
     }
     
-    private void add_stock_icon(File file, string stock_id) {
-        Gdk.Pixbuf pixbuf = null;
-        try {
-            pixbuf = new Gdk.Pixbuf.from_file(file.get_path());
-        } catch (Error err) {
-            critical("Unable to load stock icon %s: %s", stock_id, err.message);
-        }
-        
-        Gtk.IconSet icon_set = new Gtk.IconSet.from_pixbuf(pixbuf);
-        factory.add(stock_id, icon_set);
-    }
-    
-    public delegate void AddStockIconModify(Gdk.Pixbuf pixbuf);
-    
-    private void add_stock_icon_from_themed_icon(GLib.ThemedIcon gicon, string stock_id, 
-        AddStockIconModify? modify = null) {
-        Gtk.IconTheme icon_theme = Gtk.IconTheme.get_default();
-        icon_theme.append_search_path(AppDirs.get_resources_dir().get_child("icons").get_path());
-
-        Gtk.IconInfo? info = icon_theme.lookup_by_gicon(gicon, 
-            Resources.DEFAULT_ICON_SCALE, Gtk.IconLookupFlags.FORCE_SIZE);
-        if (info == null) {
-            debug("unable to load icon for: %s", stock_id);
-            return;
-        }
-        
-        try {
-            Gdk.Pixbuf pix = info.load_icon();
-            if (modify != null) {
-                modify(pix);
-            }
-            Gtk.IconSet icon_set = new Gtk.IconSet.from_pixbuf(pix);
-                factory.add(stock_id, icon_set);
-        } catch (Error err) {
-            debug("%s", err.message);
-        }
-    }
-
     // Get the directory where our help files live.  Returns a string
     // describing the help path we want, or, if we're installed system
     // -wide already, returns null.
diff --git a/src/Screensaver.c b/src/Screensaver.c
index 06e1d59..50ae28a 100644
--- a/src/Screensaver.c
+++ b/src/Screensaver.c
@@ -1,4 +1,4 @@
-/* Screensaver.c generated by valac 0.34.2, the Vala compiler
+/* Screensaver.c generated by valac 0.32.1, 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 b6c0196..d439603 100644
--- a/src/SearchFilter.c
+++ b/src/SearchFilter.c
@@ -1,4 +1,4 @@
-/* SearchFilter.c generated by valac 0.34.2, the Vala compiler
+/* SearchFilter.c generated by valac 0.32.1, the Vala compiler
  * generated from SearchFilter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1176,11 +1176,16 @@ GType library_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
 void search_filter_actions_set_action_sensitive (SearchFilterActions* self, const gchar* name, gboolean sensitive);
 void search_filter_actions_reset (SearchFilterActions* self);
-GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self);
+GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self);
+static GVariant* _variant_new32 (gboolean value);
 GSimpleAction* search_filter_actions_get_photos (SearchFilterActions* self);
+static GVariant* _variant_new33 (gboolean value);
 GSimpleAction* search_filter_actions_get_raw (SearchFilterActions* self);
+static GVariant* _variant_new34 (gboolean value);
 GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self);
-static GVariant* _variant_new28 (gchar* value);
+static GVariant* _variant_new35 (gboolean value);
+static GVariant* _variant_new36 (gchar* value);
+GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self);
 void search_filter_actions_set_sensitive_for_search_criteria (SearchFilterActions* self, SearchFilterCriteria criteria);
 static void search_filter_actions_update_sensitivities (SearchFilterActions* self);
 GType page_get_type (void) G_GNUC_CONST;
@@ -1214,13 +1219,12 @@ GType camera_accumulator_get_type (void) G_GNUC_CONST;
 gint camera_accumulator_get_photos (CameraAccumulator* self);
 gint camera_accumulator_get_videos (CameraAccumulator* self);
 gint camera_accumulator_get_raw (CameraAccumulator* self);
-static gboolean _variant_get29 (GVariant* value);
-static GVariant* _variant_new30 (gboolean value);
+static gboolean _variant_get37 (GVariant* value);
+static GVariant* _variant_new38 (gboolean value);
 gboolean search_filter_actions_get_has_photos (SearchFilterActions* self);
 gboolean search_filter_actions_get_has_videos (SearchFilterActions* self);
 gboolean search_filter_actions_get_has_raw (SearchFilterActions* self);
 gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self);
-GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self);
 static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void search_filter_actions_finalize (SearchFilterActions* obj);
 GType search_filter_toolbar_get_type (void) G_GNUC_CONST;
@@ -1286,9 +1290,9 @@ static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (Searc
 #define RESOURCES_ICON_FILTER_FLAGGED "filter-flagged"
 #define RESOURCES_ICON_FILTER_FLAGGED_DISABLED "filter-flagged-disabled"
 LibraryWindow* library_window_get_app (void);
-static GVariant* _variant_new31 (gboolean value);
+static GVariant* _variant_new39 (gboolean value);
 void search_filter_toolbar_update (SearchFilterToolbar* self);
-static GVariant* _variant_new32 (gboolean value);
+static GVariant* _variant_new40 (gboolean value);
 void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchViewFilter* search_filter);
 void search_filter_toolbar_unset_view_filter (SearchFilterToolbar* self);
 void library_window_show_search_bar (LibraryWindow* self, gboolean display);
@@ -1476,7 +1480,7 @@ static guint search_view_filter_real_get_criteria (SearchViewFilter* self) {
 	g_critical ("Type `%s' does not implement abstract method `search_view_filter_get_criteria'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return 0U;
-#line 1480 "SearchFilter.c"
+#line 1484 "SearchFilter.c"
 }
 
 
@@ -1485,7 +1489,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 1489 "SearchFilter.c"
+#line 1493 "SearchFilter.c"
 }
 
 
@@ -1504,7 +1508,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 1508 "SearchFilter.c"
+#line 1512 "SearchFilter.c"
 		{
 #line 71 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1512,11 +1516,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 1516 "SearchFilter.c"
+#line 1520 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1520 "SearchFilter.c"
+#line 1524 "SearchFilter.c"
 		{
 #line 76 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1524,11 +1528,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 1528 "SearchFilter.c"
+#line 1532 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 1532 "SearchFilter.c"
+#line 1536 "SearchFilter.c"
 		{
 #line 81 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1536,11 +1540,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 1540 "SearchFilter.c"
+#line 1544 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_ONLY:
-#line 1544 "SearchFilter.c"
+#line 1548 "SearchFilter.c"
 		{
 #line 86 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1548,11 +1552,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 1552 "SearchFilter.c"
+#line 1556 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 1556 "SearchFilter.c"
+#line 1560 "SearchFilter.c"
 		{
 #line 91 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1560,11 +1564,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 1564 "SearchFilter.c"
+#line 1568 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_ONLY:
-#line 1568 "SearchFilter.c"
+#line 1572 "SearchFilter.c"
 		{
 #line 96 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1572,11 +1576,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 1576 "SearchFilter.c"
+#line 1580 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 1580 "SearchFilter.c"
+#line 1584 "SearchFilter.c"
 		{
 #line 101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1584,11 +1588,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 1588 "SearchFilter.c"
+#line 1592 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_ONLY:
-#line 1592 "SearchFilter.c"
+#line 1596 "SearchFilter.c"
 		{
 #line 106 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1596,11 +1600,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 1600 "SearchFilter.c"
+#line 1604 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1604 "SearchFilter.c"
+#line 1608 "SearchFilter.c"
 		{
 #line 111 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1608,11 +1612,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 1612 "SearchFilter.c"
+#line 1616 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_ONLY:
-#line 1616 "SearchFilter.c"
+#line 1620 "SearchFilter.c"
 		{
 #line 116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1620,11 +1624,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 1624 "SearchFilter.c"
+#line 1628 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1628 "SearchFilter.c"
+#line 1632 "SearchFilter.c"
 		{
 #line 121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1632,11 +1636,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 1636 "SearchFilter.c"
+#line 1640 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 1640 "SearchFilter.c"
+#line 1644 "SearchFilter.c"
 		{
 #line 126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1644,12 +1648,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 1648 "SearchFilter.c"
+#line 1652 "SearchFilter.c"
 		}
 		default:
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1653 "SearchFilter.c"
+#line 1657 "SearchFilter.c"
 		{
 #line 132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_UNRATED;
@@ -1657,7 +1661,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 1661 "SearchFilter.c"
+#line 1665 "SearchFilter.c"
 		}
 	}
 }
@@ -1677,7 +1681,7 @@ gboolean search_view_filter_has_search_filter (SearchViewFilter* self) {
 	result = !_tmp1_;
 #line 139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1681 "SearchFilter.c"
+#line 1685 "SearchFilter.c"
 }
 
 
@@ -1692,7 +1696,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 1696 "SearchFilter.c"
+#line 1700 "SearchFilter.c"
 }
 
 
@@ -1716,13 +1720,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 1720 "SearchFilter.c"
+#line 1724 "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 1726 "SearchFilter.c"
+#line 1730 "SearchFilter.c"
 }
 
 
@@ -1733,17 +1737,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 1737 "SearchFilter.c"
+#line 1741 "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 1743 "SearchFilter.c"
+#line 1747 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1747 "SearchFilter.c"
+#line 1751 "SearchFilter.c"
 }
 
 
@@ -1766,7 +1770,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 1770 "SearchFilter.c"
+#line 1774 "SearchFilter.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1777,13 +1781,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 1781 "SearchFilter.c"
+#line 1785 "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 1787 "SearchFilter.c"
+#line 1791 "SearchFilter.c"
 	}
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = g_strdup (_tmp0_);
@@ -1795,7 +1799,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 1799 "SearchFilter.c"
+#line 1803 "SearchFilter.c"
 		const gchar* _tmp8_ = NULL;
 		gchar** _tmp9_ = NULL;
 		gchar** _tmp10_ = NULL;
@@ -1811,7 +1815,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 1815 "SearchFilter.c"
+#line 1819 "SearchFilter.c"
 	} else {
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
@@ -1821,7 +1825,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 1825 "SearchFilter.c"
+#line 1829 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = (_tmp6_ != NULL) ? _vala_array_dup32 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
@@ -1839,7 +1843,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 1843 "SearchFilter.c"
+#line 1847 "SearchFilter.c"
 }
 
 
@@ -1858,7 +1862,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 1862 "SearchFilter.c"
+#line 1866 "SearchFilter.c"
 }
 
 
@@ -1873,7 +1877,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 1877 "SearchFilter.c"
+#line 1881 "SearchFilter.c"
 }
 
 
@@ -1888,7 +1892,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 1892 "SearchFilter.c"
+#line 1896 "SearchFilter.c"
 }
 
 
@@ -1903,7 +1907,7 @@ Rating search_view_filter_get_rating (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1907 "SearchFilter.c"
+#line 1911 "SearchFilter.c"
 }
 
 
@@ -1921,31 +1925,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 1925 "SearchFilter.c"
+#line 1929 "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 1932 "SearchFilter.c"
+#line 1936 "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 1938 "SearchFilter.c"
+#line 1942 "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 1945 "SearchFilter.c"
+#line 1949 "SearchFilter.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 1949 "SearchFilter.c"
+#line 1953 "SearchFilter.c"
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
@@ -1953,45 +1957,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 1957 "SearchFilter.c"
+#line 1961 "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 1963 "SearchFilter.c"
+#line 1967 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp7_ = FALSE;
-#line 1967 "SearchFilter.c"
+#line 1971 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp7_) {
-#line 1971 "SearchFilter.c"
+#line 1975 "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 1977 "SearchFilter.c"
+#line 1981 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = FALSE;
-#line 1981 "SearchFilter.c"
+#line 1985 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = !_tmp6_;
-#line 1985 "SearchFilter.c"
+#line 1989 "SearchFilter.c"
 	} else {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 1989 "SearchFilter.c"
+#line 1993 "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 1995 "SearchFilter.c"
+#line 1999 "SearchFilter.c"
 }
 
 
@@ -2001,7 +2005,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 2005 "SearchFilter.c"
+#line 2009 "SearchFilter.c"
 }
 
 
@@ -2016,7 +2020,7 @@ gboolean search_view_filter_get_flagged (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2020 "SearchFilter.c"
+#line 2024 "SearchFilter.c"
 }
 
 
@@ -2028,7 +2032,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 2032 "SearchFilter.c"
+#line 2036 "SearchFilter.c"
 }
 
 
@@ -2043,7 +2047,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 2047 "SearchFilter.c"
+#line 2051 "SearchFilter.c"
 }
 
 
@@ -2055,7 +2059,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 2059 "SearchFilter.c"
+#line 2063 "SearchFilter.c"
 }
 
 
@@ -2070,7 +2074,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 2074 "SearchFilter.c"
+#line 2078 "SearchFilter.c"
 }
 
 
@@ -2082,7 +2086,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 2086 "SearchFilter.c"
+#line 2090 "SearchFilter.c"
 }
 
 
@@ -2097,7 +2101,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 2101 "SearchFilter.c"
+#line 2105 "SearchFilter.c"
 }
 
 
@@ -2109,7 +2113,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 2113 "SearchFilter.c"
+#line 2117 "SearchFilter.c"
 }
 
 
@@ -2124,14 +2128,14 @@ SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2128 "SearchFilter.c"
+#line 2132 "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 2135 "SearchFilter.c"
+#line 2139 "SearchFilter.c"
 }
 
 
@@ -2148,7 +2152,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 2152 "SearchFilter.c"
+#line 2156 "SearchFilter.c"
 }
 
 
@@ -2161,7 +2165,7 @@ static void search_view_filter_class_init (SearchViewFilterClass * klass) {
 	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 2165 "SearchFilter.c"
+#line 2169 "SearchFilter.c"
 }
 
 
@@ -2192,7 +2196,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 2196 "SearchFilter.c"
+#line 2200 "SearchFilter.c"
 }
 
 
@@ -2208,7 +2212,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 2212 "SearchFilter.c"
+#line 2216 "SearchFilter.c"
 }
 
 
@@ -2228,19 +2232,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 2244 "SearchFilter.c"
+#line 2248 "SearchFilter.c"
 }
 
 
@@ -2278,14 +2282,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 2282 "SearchFilter.c"
+#line 2286 "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 2289 "SearchFilter.c"
+#line 2293 "SearchFilter.c"
 			MediaSource* _tmp6_ = NULL;
 			Rating _tmp7_ = 0;
 			Rating _tmp8_ = 0;
@@ -2297,11 +2301,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 2301 "SearchFilter.c"
+#line 2305 "SearchFilter.c"
 		} else {
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = FALSE;
-#line 2305 "SearchFilter.c"
+#line 2309 "SearchFilter.c"
 		}
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp4_) {
@@ -2311,7 +2315,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 2315 "SearchFilter.c"
+#line 2319 "SearchFilter.c"
 		} else {
 			gboolean _tmp9_ = FALSE;
 			gboolean _tmp10_ = FALSE;
@@ -2319,7 +2323,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 2323 "SearchFilter.c"
+#line 2327 "SearchFilter.c"
 				MediaSource* _tmp11_ = NULL;
 				Rating _tmp12_ = 0;
 				Rating _tmp13_ = 0;
@@ -2331,11 +2335,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 2335 "SearchFilter.c"
+#line 2339 "SearchFilter.c"
 			} else {
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp9_ = FALSE;
-#line 2339 "SearchFilter.c"
+#line 2343 "SearchFilter.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp9_) {
@@ -2345,7 +2349,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 2349 "SearchFilter.c"
+#line 2353 "SearchFilter.c"
 			}
 		}
 	}
@@ -2353,7 +2357,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 2357 "SearchFilter.c"
+#line 2361 "SearchFilter.c"
 		gboolean _tmp15_ = FALSE;
 		gboolean _tmp16_ = FALSE;
 		gboolean _tmp17_ = FALSE;
@@ -2364,21 +2368,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 2368 "SearchFilter.c"
+#line 2372 "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 2374 "SearchFilter.c"
+#line 2378 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp16_ = FALSE;
-#line 2378 "SearchFilter.c"
+#line 2382 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp16_) {
-#line 2382 "SearchFilter.c"
+#line 2386 "SearchFilter.c"
 			MediaSource* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2387,11 +2391,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 2391 "SearchFilter.c"
+#line 2395 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp15_ = FALSE;
-#line 2395 "SearchFilter.c"
+#line 2399 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp15_) {
@@ -2401,34 +2405,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 2405 "SearchFilter.c"
+#line 2409 "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 2412 "SearchFilter.c"
+#line 2416 "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 2418 "SearchFilter.c"
+#line 2422 "SearchFilter.c"
 	} else {
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp22_ = FALSE;
-#line 2422 "SearchFilter.c"
+#line 2426 "SearchFilter.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp22_) {
-#line 2426 "SearchFilter.c"
+#line 2430 "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 2432 "SearchFilter.c"
+#line 2436 "SearchFilter.c"
 			gboolean _tmp26_ = FALSE;
 			gboolean _tmp27_ = FALSE;
 #line 202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2443,7 +2447,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 2447 "SearchFilter.c"
+#line 2451 "SearchFilter.c"
 			}
 		} else {
 			MediaSource* _tmp28_ = NULL;
@@ -2451,7 +2455,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 2455 "SearchFilter.c"
+#line 2459 "SearchFilter.c"
 				Photo* photo = NULL;
 				MediaSource* _tmp29_ = NULL;
 				Photo* _tmp30_ = NULL;
@@ -2469,7 +2473,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 2473 "SearchFilter.c"
+#line 2477 "SearchFilter.c"
 					Photo* _tmp33_ = NULL;
 					gboolean _tmp34_ = FALSE;
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2478,7 +2482,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 2482 "SearchFilter.c"
+#line 2486 "SearchFilter.c"
 						gboolean _tmp35_ = FALSE;
 						gboolean _tmp36_ = FALSE;
 						gboolean _tmp37_ = FALSE;
@@ -2488,7 +2492,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 2492 "SearchFilter.c"
+#line 2496 "SearchFilter.c"
 							gboolean _tmp38_ = FALSE;
 							gboolean _tmp39_ = FALSE;
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2497,11 +2501,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 2501 "SearchFilter.c"
+#line 2505 "SearchFilter.c"
 						} else {
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							_tmp35_ = FALSE;
-#line 2505 "SearchFilter.c"
+#line 2509 "SearchFilter.c"
 						}
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						if (_tmp35_) {
@@ -2513,7 +2517,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 2517 "SearchFilter.c"
+#line 2521 "SearchFilter.c"
 						}
 					} else {
 						gboolean _tmp40_ = FALSE;
@@ -2532,7 +2536,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 2536 "SearchFilter.c"
+#line 2540 "SearchFilter.c"
 						}
 					}
 				} else {
@@ -2552,12 +2556,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 2556 "SearchFilter.c"
+#line 2560 "SearchFilter.c"
 					}
 				}
 #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (photo);
-#line 2561 "SearchFilter.c"
+#line 2565 "SearchFilter.c"
 			}
 		}
 	}
@@ -2565,21 +2569,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 2569 "SearchFilter.c"
+#line 2573 "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 2575 "SearchFilter.c"
+#line 2579 "SearchFilter.c"
 	} else {
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp44_ = FALSE;
-#line 2579 "SearchFilter.c"
+#line 2583 "SearchFilter.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp44_) {
-#line 2583 "SearchFilter.c"
+#line 2587 "SearchFilter.c"
 		const gchar* media_keywords = NULL;
 		MediaSource* _tmp47_ = NULL;
 		const gchar* _tmp48_ = NULL;
@@ -2615,7 +2619,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 2619 "SearchFilter.c"
+#line 2623 "SearchFilter.c"
 			Event* _tmp52_ = NULL;
 			const gchar* _tmp53_ = NULL;
 #line 225 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2624,7 +2628,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 2628 "SearchFilter.c"
+#line 2632 "SearchFilter.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp54_ = tag_global;
@@ -2638,7 +2642,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 2642 "SearchFilter.c"
+#line 2646 "SearchFilter.c"
 			GeeList* _tmp59_ = NULL;
 			gint _tmp60_ = 0;
 			gint _tmp61_ = 0;
@@ -2650,17 +2654,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 2654 "SearchFilter.c"
+#line 2658 "SearchFilter.c"
 		} else {
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp57_ = 0;
-#line 2658 "SearchFilter.c"
+#line 2662 "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 2664 "SearchFilter.c"
+#line 2668 "SearchFilter.c"
 		{
 			gchar** word_collection = NULL;
 			gint word_collection_length1 = 0;
@@ -2672,11 +2676,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 2676 "SearchFilter.c"
+#line 2680 "SearchFilter.c"
 				const gchar* word = NULL;
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				word = word_collection[word_it];
-#line 2680 "SearchFilter.c"
+#line 2684 "SearchFilter.c"
 				{
 					gboolean _tmp64_ = FALSE;
 					const gchar* _tmp65_ = NULL;
@@ -2687,7 +2691,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 2691 "SearchFilter.c"
+#line 2695 "SearchFilter.c"
 						const gchar* _tmp66_ = NULL;
 						const gchar* _tmp67_ = NULL;
 						gboolean _tmp68_ = FALSE;
@@ -2699,23 +2703,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 2703 "SearchFilter.c"
+#line 2707 "SearchFilter.c"
 					} else {
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp64_ = FALSE;
-#line 2707 "SearchFilter.c"
+#line 2711 "SearchFilter.c"
 					}
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp64_) {
 #line 232 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2713 "SearchFilter.c"
+#line 2717 "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 2719 "SearchFilter.c"
+#line 2723 "SearchFilter.c"
 						const gchar* _tmp71_ = NULL;
 						const gchar* _tmp72_ = NULL;
 						gboolean _tmp73_ = FALSE;
@@ -2727,40 +2731,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 2731 "SearchFilter.c"
+#line 2735 "SearchFilter.c"
 					} else {
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp69_ = FALSE;
-#line 2735 "SearchFilter.c"
+#line 2739 "SearchFilter.c"
 					}
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp69_) {
 #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2741 "SearchFilter.c"
+#line 2745 "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 2747 "SearchFilter.c"
+#line 2751 "SearchFilter.c"
 						gboolean found = FALSE;
 						gboolean _tmp90_ = FALSE;
 #line 238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						found = FALSE;
-#line 2752 "SearchFilter.c"
+#line 2756 "SearchFilter.c"
 						{
 							gint ctr = 0;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							ctr = 0;
-#line 2757 "SearchFilter.c"
+#line 2761 "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 2764 "SearchFilter.c"
+#line 2768 "SearchFilter.c"
 									gint _tmp77_ = 0;
 									gint _tmp78_ = 0;
 									const gchar* tag_keywords = NULL;
@@ -2774,13 +2778,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 2778 "SearchFilter.c"
+#line 2782 "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 2784 "SearchFilter.c"
+#line 2788 "SearchFilter.c"
 									}
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									_tmp75_ = FALSE;
@@ -2792,7 +2796,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 2796 "SearchFilter.c"
+#line 2800 "SearchFilter.c"
 									}
 #line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									_tmp79_ = tags;
@@ -2814,7 +2818,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 2818 "SearchFilter.c"
+#line 2822 "SearchFilter.c"
 										const gchar* _tmp87_ = NULL;
 										const gchar* _tmp88_ = NULL;
 										gboolean _tmp89_ = FALSE;
@@ -2826,11 +2830,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 2830 "SearchFilter.c"
+#line 2834 "SearchFilter.c"
 									} else {
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										_tmp85_ = FALSE;
-#line 2834 "SearchFilter.c"
+#line 2838 "SearchFilter.c"
 									}
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (_tmp85_) {
@@ -2838,7 +2842,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 2842 "SearchFilter.c"
+#line 2846 "SearchFilter.c"
 									}
 								}
 							}
@@ -2849,7 +2853,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 2853 "SearchFilter.c"
+#line 2857 "SearchFilter.c"
 						}
 					}
 #line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2862,7 +2866,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 2866 "SearchFilter.c"
+#line 2870 "SearchFilter.c"
 				}
 			}
 		}
@@ -2870,27 +2874,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 2874 "SearchFilter.c"
+#line 2878 "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 2880 "SearchFilter.c"
+#line 2884 "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 2886 "SearchFilter.c"
+#line 2890 "SearchFilter.c"
 	} else {
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp91_ = FALSE;
-#line 2890 "SearchFilter.c"
+#line 2894 "SearchFilter.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp91_) {
-#line 2894 "SearchFilter.c"
+#line 2898 "SearchFilter.c"
 		SavedSearch* _tmp94_ = NULL;
 		SavedSearch* _tmp95_ = NULL;
 		MediaSource* _tmp96_ = NULL;
@@ -2909,7 +2913,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 2913 "SearchFilter.c"
+#line 2917 "SearchFilter.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = TRUE;
@@ -2917,7 +2921,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 2921 "SearchFilter.c"
+#line 2925 "SearchFilter.c"
 }
 
 
@@ -2927,7 +2931,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 2931 "SearchFilter.c"
+#line 2935 "SearchFilter.c"
 }
 
 
@@ -2936,7 +2940,7 @@ static void default_search_view_filter_class_init (DefaultSearchViewFilterClass
 	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 2940 "SearchFilter.c"
+#line 2944 "SearchFilter.c"
 }
 
 
@@ -2967,7 +2971,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 2971 "SearchFilter.c"
+#line 2975 "SearchFilter.c"
 }
 
 
@@ -2980,7 +2984,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 2984 "SearchFilter.c"
+#line 2988 "SearchFilter.c"
 }
 
 
@@ -2990,14 +2994,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 2994 "SearchFilter.c"
+#line 2998 "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 3001 "SearchFilter.c"
+#line 3005 "SearchFilter.c"
 }
 
 
@@ -3008,7 +3012,7 @@ static void disabled_view_filter_class_init (DisabledViewFilterClass * klass) {
 	((ViewFilterClass *) klass)->predicate = 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 3012 "SearchFilter.c"
+#line 3016 "SearchFilter.c"
 }
 
 
@@ -3044,14 +3048,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 3048 "SearchFilter.c"
+#line 3052 "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 3055 "SearchFilter.c"
+#line 3059 "SearchFilter.c"
 }
 
 
@@ -3066,7 +3070,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 3070 "SearchFilter.c"
+#line 3074 "SearchFilter.c"
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -3082,7 +3086,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 3086 "SearchFilter.c"
+#line 3090 "SearchFilter.c"
 	}
 }
 
@@ -3092,7 +3096,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 3096 "SearchFilter.c"
+#line 3100 "SearchFilter.c"
 }
 
 
@@ -3107,7 +3111,7 @@ gboolean text_action_is_sensitive (TextAction* self) {
 	result = _tmp0_;
 #line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3111 "SearchFilter.c"
+#line 3115 "SearchFilter.c"
 }
 
 
@@ -3122,7 +3126,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 3126 "SearchFilter.c"
+#line 3130 "SearchFilter.c"
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
 #line 315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3133,7 +3137,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 3137 "SearchFilter.c"
+#line 3141 "SearchFilter.c"
 	}
 }
 
@@ -3149,7 +3153,7 @@ gboolean text_action_is_visible (TextAction* self) {
 	result = _tmp0_;
 #line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3153 "SearchFilter.c"
+#line 3157 "SearchFilter.c"
 }
 
 
@@ -3164,7 +3168,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 3168 "SearchFilter.c"
+#line 3172 "SearchFilter.c"
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
 #line 326 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3175,7 +3179,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 3179 "SearchFilter.c"
+#line 3183 "SearchFilter.c"
 	}
 }
 
@@ -3191,14 +3195,14 @@ const gchar* text_action_get_value (TextAction* self) {
 	result = _tmp0_;
 #line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3195 "SearchFilter.c"
+#line 3199 "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 3202 "SearchFilter.c"
+#line 3206 "SearchFilter.c"
 }
 
 
@@ -3207,7 +3211,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 3211 "SearchFilter.c"
+#line 3215 "SearchFilter.c"
 	}
 }
 
@@ -3217,11 +3221,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 3221 "SearchFilter.c"
+#line 3225 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3225 "SearchFilter.c"
+#line 3229 "SearchFilter.c"
 	}
 }
 
@@ -3229,37 +3233,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 3233 "SearchFilter.c"
+#line 3237 "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 3240 "SearchFilter.c"
+#line 3244 "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 3247 "SearchFilter.c"
+#line 3251 "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 3251 "SearchFilter.c"
+#line 3255 "SearchFilter.c"
 		}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = text_action_ref (object);
-#line 3255 "SearchFilter.c"
+#line 3259 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3259 "SearchFilter.c"
+#line 3263 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3263 "SearchFilter.c"
+#line 3267 "SearchFilter.c"
 }
 
 
@@ -3270,25 +3274,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 3274 "SearchFilter.c"
+#line 3278 "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 3280 "SearchFilter.c"
+#line 3284 "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 3284 "SearchFilter.c"
+#line 3288 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = text_action_ref (value->data[0].v_pointer);
-#line 3288 "SearchFilter.c"
+#line 3292 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3292 "SearchFilter.c"
+#line 3296 "SearchFilter.c"
 }
 
 
@@ -3302,7 +3306,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 3306 "SearchFilter.c"
+#line 3310 "SearchFilter.c"
 }
 
 
@@ -3311,7 +3315,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 3315 "SearchFilter.c"
+#line 3319 "SearchFilter.c"
 }
 
 
@@ -3331,17 +3335,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 3335 "SearchFilter.c"
+#line 3339 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3339 "SearchFilter.c"
+#line 3343 "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 3345 "SearchFilter.c"
+#line 3349 "SearchFilter.c"
 	}
 }
 
@@ -3360,17 +3364,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 3364 "SearchFilter.c"
+#line 3368 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3368 "SearchFilter.c"
+#line 3372 "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 3374 "SearchFilter.c"
+#line 3378 "SearchFilter.c"
 	}
 }
 
@@ -3388,7 +3392,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 3392 "SearchFilter.c"
+#line 3396 "SearchFilter.c"
 }
 
 
@@ -3403,7 +3407,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 3407 "SearchFilter.c"
+#line 3411 "SearchFilter.c"
 }
 
 
@@ -3415,7 +3419,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 3419 "SearchFilter.c"
+#line 3423 "SearchFilter.c"
 }
 
 
@@ -3440,7 +3444,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 3444 "SearchFilter.c"
+#line 3448 "SearchFilter.c"
 }
 
 
@@ -3453,7 +3457,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 3457 "SearchFilter.c"
+#line 3461 "SearchFilter.c"
 	}
 }
 
@@ -3461,56 +3465,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 3465 "SearchFilter.c"
+#line 3469 "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 3472 "SearchFilter.c"
+#line 3476 "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 3479 "SearchFilter.c"
+#line 3483 "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 3486 "SearchFilter.c"
+#line 3490 "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 3493 "SearchFilter.c"
+#line 3497 "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 3500 "SearchFilter.c"
+#line 3504 "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 3507 "SearchFilter.c"
+#line 3511 "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 3514 "SearchFilter.c"
+#line 3518 "SearchFilter.c"
 }
 
 
@@ -3530,14 +3534,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 3534 "SearchFilter.c"
+#line 3538 "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 3541 "SearchFilter.c"
+#line 3545 "SearchFilter.c"
 }
 
 
@@ -3552,7 +3556,7 @@ SearchFilterCriteria search_filter_actions_get_criteria (SearchFilterActions* se
 	result = _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3556 "SearchFilter.c"
+#line 3560 "SearchFilter.c"
 }
 
 
@@ -3570,13 +3574,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 3574 "SearchFilter.c"
+#line 3578 "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 3580 "SearchFilter.c"
+#line 3584 "SearchFilter.c"
 }
 
 
@@ -3598,7 +3602,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 3602 "SearchFilter.c"
+#line 3606 "SearchFilter.c"
 	}
 #line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	lw = _tmp1_;
@@ -3606,7 +3610,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 3610 "SearchFilter.c"
+#line 3614 "SearchFilter.c"
 		LibraryWindow* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		GAction* _tmp5_ = NULL;
@@ -3622,7 +3626,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 3626 "SearchFilter.c"
+#line 3630 "SearchFilter.c"
 	}
 #line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = NULL;
@@ -3630,7 +3634,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 3634 "SearchFilter.c"
+#line 3638 "SearchFilter.c"
 }
 
 
@@ -3656,7 +3660,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 3660 "SearchFilter.c"
+#line 3664 "SearchFilter.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3665,92 +3669,140 @@ 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 3669 "SearchFilter.c"
+#line 3673 "SearchFilter.c"
 	}
 #line 431 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
-#line 3673 "SearchFilter.c"
+#line 3677 "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 3684 "SearchFilter.c"
 }
 
 
-static GVariant* _variant_new28 (gchar* value) {
+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 3691 "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 3698 "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 3705 "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 3680 "SearchFilter.c"
+#line 3712 "SearchFilter.c"
 }
 
 
 void search_filter_actions_reset (SearchFilterActions* self) {
 	GSimpleAction* _tmp0_ = NULL;
 	GSimpleAction* _tmp1_ = NULL;
-	GSimpleAction* _tmp2_ = NULL;
+	GVariant* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
-	GSimpleAction* _tmp5_ = NULL;
+	GVariant* _tmp5_ = NULL;
 	GSimpleAction* _tmp6_ = NULL;
 	GSimpleAction* _tmp7_ = NULL;
-	GVariant* v = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	GVariant* _tmp10_ = NULL;
+	GVariant* _tmp8_ = NULL;
+	GSimpleAction* _tmp9_ = NULL;
+	GSimpleAction* _tmp10_ = NULL;
 	GVariant* _tmp11_ = NULL;
-	GSimpleAction* _tmp12_ = NULL;
-	GSimpleAction* _tmp13_ = NULL;
-	TextAction* _tmp14_ = NULL;
-	TextAction* _tmp15_ = NULL;
+	GVariant* v = NULL;
+	gchar* _tmp12_ = NULL;
+	gchar* _tmp13_ = NULL;
+	GVariant* _tmp14_ = NULL;
+	GVariant* _tmp15_ = NULL;
+	GSimpleAction* _tmp16_ = NULL;
+	GSimpleAction* _tmp17_ = NULL;
+	TextAction* _tmp18_ = NULL;
+	TextAction* _tmp19_ = NULL;
 #line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
 #line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = search_filter_actions_get_rating (self);
+	_tmp0_ = search_filter_actions_get_flagged (self);
 #line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_;
 #line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_simple_action_set_enabled (_tmp1_, FALSE);
+	_tmp2_ = _variant_new32 (FALSE);
+#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit_by_name (_tmp1_, "change-state", _tmp2_);
+#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_variant_unref0 (_tmp2_);
 #line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = search_filter_actions_get_photos (self);
+	_tmp3_ = search_filter_actions_get_photos (self);
 #line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp3_ = _tmp2_;
+	_tmp4_ = _tmp3_;
+#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp5_ = _variant_new33 (FALSE);
 #line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_simple_action_set_enabled (_tmp3_, FALSE);
+	g_signal_emit_by_name (_tmp4_, "change-state", _tmp5_);
+#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_variant_unref0 (_tmp5_);
+#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp6_ = search_filter_actions_get_raw (self);
 #line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp4_ = search_filter_actions_get_raw (self);
+	_tmp7_ = _tmp6_;
 #line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp5_ = _tmp4_;
+	_tmp8_ = _variant_new34 (FALSE);
 #line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_simple_action_set_enabled (_tmp5_, FALSE);
+	g_signal_emit_by_name (_tmp7_, "change-state", _tmp8_);
+#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_variant_unref0 (_tmp8_);
 #line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp6_ = search_filter_actions_get_videos (self);
+	_tmp9_ = search_filter_actions_get_videos (self);
 #line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp7_ = _tmp6_;
+	_tmp10_ = _tmp9_;
 #line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_simple_action_set_enabled (_tmp7_, FALSE);
+	_tmp11_ = _variant_new35 (FALSE);
+#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit_by_name (_tmp10_, "change-state", _tmp11_);
+#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_variant_unref0 (_tmp11_);
 #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp8_ = g_strdup_printf ("'%d'", (gint) RATING_FILTER_UNRATED_OR_HIGHER);
+	_tmp12_ = g_strdup_printf ("%d", (gint) RATING_FILTER_UNRATED_OR_HIGHER);
 #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_ = _tmp8_;
+	_tmp13_ = _tmp12_;
 #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp10_ = _variant_new28 (_tmp9_);
+	_tmp14_ = _variant_new36 (_tmp13_);
 #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp11_ = _tmp10_;
+	_tmp15_ = _tmp14_;
 #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_free0 (_tmp9_);
+	_g_free0 (_tmp13_);
 #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	v = _tmp11_;
+	v = _tmp15_;
 #line 444 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp12_ = search_filter_actions_get_rating (self);
+	_tmp16_ = search_filter_actions_get_rating (self);
 #line 444 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp13_ = _tmp12_;
+	_tmp17_ = _tmp16_;
 #line 444 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_simple_action_set_state (_tmp13_, v);
+	g_signal_emit_by_name (_tmp17_, "change-state", v);
 #line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp14_ = search_filter_actions_get_text (self);
+	_tmp18_ = search_filter_actions_get_text (self);
 #line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp15_ = _tmp14_;
+	_tmp19_ = _tmp18_;
 #line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	text_action_set_text (_tmp15_, NULL);
+	text_action_set_text (_tmp19_, NULL);
 #line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (v);
-#line 3754 "SearchFilter.c"
+#line 3806 "SearchFilter.c"
 }
 
 
@@ -3766,21 +3818,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 3770 "SearchFilter.c"
+#line 3822 "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 3777 "SearchFilter.c"
+#line 3829 "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 3784 "SearchFilter.c"
+#line 3836 "SearchFilter.c"
 }
 
 
@@ -3809,7 +3861,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 3813 "SearchFilter.c"
+#line 3865 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
 		CheckerboardPage* _tmp3_ = NULL;
 		CoreViewTracker* _tmp4_ = NULL;
@@ -3824,7 +3876,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 3828 "SearchFilter.c"
+#line 3880 "SearchFilter.c"
 			CoreViewTracker* _tmp6_ = NULL;
 			guint _tmp7_ = 0U;
 #line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3833,14 +3885,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 3837 "SearchFilter.c"
+#line 3889 "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 3844 "SearchFilter.c"
+#line 3896 "SearchFilter.c"
 				CoreViewTracker* _tmp9_ = NULL;
 				guint _tmp10_ = 0U;
 #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3849,12 +3901,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 3853 "SearchFilter.c"
+#line 3905 "SearchFilter.c"
 			}
 		}
 #line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3858 "SearchFilter.c"
+#line 3910 "SearchFilter.c"
 	}
 #line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = new_page;
@@ -3866,7 +3918,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 3870 "SearchFilter.c"
+#line 3922 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
 		CheckerboardPage* _tmp14_ = NULL;
 		CoreViewTracker* _tmp15_ = NULL;
@@ -3883,7 +3935,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 3887 "SearchFilter.c"
+#line 3939 "SearchFilter.c"
 			CoreViewTracker* _tmp17_ = NULL;
 			CoreViewTracker* _tmp18_ = NULL;
 #line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3902,14 +3954,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 3906 "SearchFilter.c"
+#line 3958 "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 3913 "SearchFilter.c"
+#line 3965 "SearchFilter.c"
 				CoreViewTracker* _tmp20_ = NULL;
 				CoreViewTracker* _tmp21_ = NULL;
 #line 478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3928,12 +3980,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 3932 "SearchFilter.c"
+#line 3984 "SearchFilter.c"
 			}
 		}
 #line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3937 "SearchFilter.c"
+#line 3989 "SearchFilter.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_flagged = FALSE;
@@ -3951,14 +4003,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 3955 "SearchFilter.c"
+#line 4007 "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 3962 "SearchFilter.c"
+#line 4014 "SearchFilter.c"
 }
 
 
@@ -4012,7 +4064,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 4016 "SearchFilter.c"
+#line 4068 "SearchFilter.c"
 }
 
 
@@ -4069,7 +4121,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 4073 "SearchFilter.c"
+#line 4125 "SearchFilter.c"
 }
 
 
@@ -4109,7 +4161,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 4113 "SearchFilter.c"
+#line 4165 "SearchFilter.c"
 }
 
 
@@ -4123,7 +4175,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 4127 "SearchFilter.c"
+#line 4179 "SearchFilter.c"
 }
 
 
@@ -4140,21 +4192,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 4144 "SearchFilter.c"
+#line 4196 "SearchFilter.c"
 }
 
 
-static gboolean _variant_get29 (GVariant* value) {
+static gboolean _variant_get37 (GVariant* value) {
 #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_get_boolean (value);
-#line 4151 "SearchFilter.c"
+#line 4203 "SearchFilter.c"
 }
 
 
-static GVariant* _variant_new30 (gboolean value) {
+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 4158 "SearchFilter.c"
+#line 4210 "SearchFilter.c"
 }
 
 
@@ -4178,7 +4230,7 @@ static void search_filter_actions_on_action_toggle (SearchFilterActions* self, G
 #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = _tmp1_;
 #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp3_ = _variant_get29 (_tmp2_);
+	_tmp3_ = _variant_get37 (_tmp2_);
 #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = _tmp3_;
 #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -4188,12 +4240,12 @@ static void search_filter_actions_on_action_toggle (SearchFilterActions* self, G
 #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = action;
 #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp6_ = _variant_new30 (!state);
+	_tmp6_ = _variant_new38 (!state);
 #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
 #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp6_);
-#line 4197 "SearchFilter.c"
+#line 4249 "SearchFilter.c"
 }
 
 
@@ -4207,17 +4259,25 @@ 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 4211 "SearchFilter.c"
+#line 4263 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_on_rating_changed (SearchFilterActions* self, GSimpleAction* action, GVariant* value) {
-	GSimpleAction* _tmp0_ = NULL;
-	GVariant* _tmp1_ = NULL;
+	GVariant* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+	GVariant* _tmp3_ = NULL;
+	GVariant* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+	gboolean _tmp6_ = FALSE;
 	RatingFilter filter = 0;
-	GVariant* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	GVariant* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+	gint _tmp9_ = 0;
+	GSimpleAction* _tmp10_ = NULL;
+	GVariant* _tmp11_ = NULL;
+	RatingFilter _tmp12_ = 0;
 #line 555 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
 #line 555 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -4225,22 +4285,46 @@ static void search_filter_actions_on_rating_changed (SearchFilterActions* self,
 #line 555 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (value != NULL);
 #line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = action;
+	_tmp0_ = value;
 #line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = value;
+	_tmp1_ = g_variant_get_string (_tmp0_, NULL);
 #line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_simple_action_set_state (_tmp0_, _tmp1_);
-#line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = value;
-#line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp3_ = g_variant_get_string (_tmp2_, NULL);
-#line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp4_ = atoi (_tmp3_);
+	_tmp2_ = action;
+#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp3_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_action_get_type (), GAction));
+#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp4_ = _tmp3_;
+#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp5_ = g_variant_get_string (_tmp4_, NULL);
+#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp6_ = g_strcmp0 (_tmp1_, _tmp5_) == 0;
+#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_variant_unref0 (_tmp4_);
+#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	if (_tmp6_) {
 #line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	filter = (RatingFilter) _tmp4_;
-#line 559 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "rating-changed", filter);
-#line 4244 "SearchFilter.c"
+		return;
+#line 4308 "SearchFilter.c"
+	}
+#line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp7_ = value;
+#line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp8_ = g_variant_get_string (_tmp7_, NULL);
+#line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp9_ = atoi (_tmp8_);
+#line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	filter = (RatingFilter) _tmp9_;
+#line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp10_ = action;
+#line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp11_ = value;
+#line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_simple_action_set_state (_tmp10_, _tmp11_);
+#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp12_ = filter;
+#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit_by_name (self, "rating-changed", _tmp12_);
+#line 4328 "SearchFilter.c"
 }
 
 
@@ -4249,25 +4333,25 @@ static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self,
 	GVariant* _tmp1_ = NULL;
 	GVariant* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (value != NULL);
-#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = value;
-#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_simple_action_set_state (_tmp0_, _tmp1_);
-#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = value;
-#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
-#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "flagged-toggled", _tmp3_);
-#line 4271 "SearchFilter.c"
+#line 4355 "SearchFilter.c"
 }
 
 
@@ -4276,25 +4360,25 @@ static void search_filter_actions_on_photos_toggled (SearchFilterActions* self,
 	GVariant* _tmp1_ = NULL;
 	GVariant* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (value != NULL);
-#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = value;
-#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_simple_action_set_state (_tmp0_, _tmp1_);
-#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = value;
-#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
-#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "photos-toggled", _tmp3_);
-#line 4298 "SearchFilter.c"
+#line 4382 "SearchFilter.c"
 }
 
 
@@ -4303,25 +4387,25 @@ static void search_filter_actions_on_videos_toggled (SearchFilterActions* self,
 	GVariant* _tmp1_ = NULL;
 	GVariant* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (value != NULL);
-#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = value;
-#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_simple_action_set_state (_tmp0_, _tmp1_);
-#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = value;
-#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
-#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "videos-toggled", _tmp3_);
-#line 4325 "SearchFilter.c"
+#line 4409 "SearchFilter.c"
 }
 
 
@@ -4330,85 +4414,85 @@ static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GSi
 	GVariant* _tmp1_ = NULL;
 	GVariant* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (value != NULL);
-#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 585 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 585 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = value;
-#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 585 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_simple_action_set_state (_tmp0_, _tmp1_);
-#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = value;
-#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
-#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "raw-toggled", _tmp3_);
-#line 4352 "SearchFilter.c"
+#line 4436 "SearchFilter.c"
 }
 
 
 gboolean search_filter_actions_get_has_photos (SearchFilterActions* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 589 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE);
-#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->has_photos;
-#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4367 "SearchFilter.c"
+#line 4451 "SearchFilter.c"
 }
 
 
 gboolean search_filter_actions_get_has_videos (SearchFilterActions* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 593 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE);
-#line 591 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->has_videos;
-#line 591 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 591 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4382 "SearchFilter.c"
+#line 4466 "SearchFilter.c"
 }
 
 
 gboolean search_filter_actions_get_has_raw (SearchFilterActions* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 597 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE);
-#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->has_raw;
-#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4397 "SearchFilter.c"
+#line 4481 "SearchFilter.c"
 }
 
 
 gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 601 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE);
-#line 599 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->has_flagged;
-#line 599 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 599 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4412 "SearchFilter.c"
+#line 4496 "SearchFilter.c"
 }
 
 
@@ -4423,7 +4507,7 @@ GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4427 "SearchFilter.c"
+#line 4511 "SearchFilter.c"
 }
 
 
@@ -4438,7 +4522,7 @@ GSimpleAction* search_filter_actions_get_photos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4442 "SearchFilter.c"
+#line 4526 "SearchFilter.c"
 }
 
 
@@ -4453,7 +4537,7 @@ GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4457 "SearchFilter.c"
+#line 4541 "SearchFilter.c"
 }
 
 
@@ -4468,7 +4552,7 @@ GSimpleAction* search_filter_actions_get_raw (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4472 "SearchFilter.c"
+#line 4556 "SearchFilter.c"
 }
 
 
@@ -4483,7 +4567,7 @@ GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4487 "SearchFilter.c"
+#line 4571 "SearchFilter.c"
 }
 
 
@@ -4503,7 +4587,7 @@ TextAction* search_filter_actions_get_text (SearchFilterActions* self) {
 	result = _tmp1_;
 #line 367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4507 "SearchFilter.c"
+#line 4591 "SearchFilter.c"
 }
 
 
@@ -4522,26 +4606,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 4526 "SearchFilter.c"
+#line 4610 "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 4532 "SearchFilter.c"
+#line 4616 "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 4538 "SearchFilter.c"
+#line 4622 "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 4545 "SearchFilter.c"
+#line 4629 "SearchFilter.c"
 }
 
 
@@ -4550,7 +4634,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 4554 "SearchFilter.c"
+#line 4638 "SearchFilter.c"
 	}
 }
 
@@ -4560,11 +4644,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 4564 "SearchFilter.c"
+#line 4648 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4568 "SearchFilter.c"
+#line 4652 "SearchFilter.c"
 	}
 }
 
@@ -4572,37 +4656,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 4576 "SearchFilter.c"
+#line 4660 "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 4583 "SearchFilter.c"
+#line 4667 "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 4590 "SearchFilter.c"
+#line 4674 "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 4594 "SearchFilter.c"
+#line 4678 "SearchFilter.c"
 		}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = search_filter_actions_ref (object);
-#line 4598 "SearchFilter.c"
+#line 4682 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4602 "SearchFilter.c"
+#line 4686 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 4606 "SearchFilter.c"
+#line 4690 "SearchFilter.c"
 }
 
 
@@ -4613,25 +4697,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 4617 "SearchFilter.c"
+#line 4701 "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 4623 "SearchFilter.c"
+#line 4707 "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 4627 "SearchFilter.c"
+#line 4711 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = search_filter_actions_ref (value->data[0].v_pointer);
-#line 4631 "SearchFilter.c"
+#line 4715 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 4635 "SearchFilter.c"
+#line 4719 "SearchFilter.c"
 }
 
 
@@ -4645,7 +4729,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 4649 "SearchFilter.c"
+#line 4733 "SearchFilter.c"
 }
 
 
@@ -4654,7 +4738,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 4658 "SearchFilter.c"
+#line 4742 "SearchFilter.c"
 }
 
 
@@ -4674,17 +4758,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 4678 "SearchFilter.c"
+#line 4762 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4682 "SearchFilter.c"
+#line 4766 "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 4688 "SearchFilter.c"
+#line 4772 "SearchFilter.c"
 	}
 }
 
@@ -4703,17 +4787,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 4707 "SearchFilter.c"
+#line 4791 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4711 "SearchFilter.c"
+#line 4795 "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 4717 "SearchFilter.c"
+#line 4801 "SearchFilter.c"
 	}
 }
 
@@ -4737,7 +4821,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 4741 "SearchFilter.c"
+#line 4825 "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
@@ -4747,7 +4831,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 4751 "SearchFilter.c"
+#line 4835 "SearchFilter.c"
 }
 
 
@@ -4770,7 +4854,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 4774 "SearchFilter.c"
+#line 4858 "SearchFilter.c"
 }
 
 
@@ -4782,7 +4866,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 4786 "SearchFilter.c"
+#line 4870 "SearchFilter.c"
 }
 
 
@@ -4807,7 +4891,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 4811 "SearchFilter.c"
+#line 4895 "SearchFilter.c"
 }
 
 
@@ -4820,7 +4904,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 4824 "SearchFilter.c"
+#line 4908 "SearchFilter.c"
 	}
 }
 
@@ -4828,56 +4912,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 1159 "/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 4832 "SearchFilter.c"
+#line 4916 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_flagged_toggled ((SearchFilterToolbar*) self);
-#line 4839 "SearchFilter.c"
+#line 4923 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_photos_toggled ((SearchFilterToolbar*) self);
-#line 4846 "SearchFilter.c"
+#line 4930 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_videos_toggled ((SearchFilterToolbar*) self);
-#line 4853 "SearchFilter.c"
+#line 4937 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_raw_toggled ((SearchFilterToolbar*) self);
-#line 4860 "SearchFilter.c"
+#line 4944 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed (SearchFilterActions* _sender, RatingFilter filter, gpointer self) {
 #line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_rating_changed ((SearchFilterToolbar*) self);
-#line 4867 "SearchFilter.c"
+#line 4951 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed (SearchFilterActions* _sender, const gchar* text, gpointer self) {
 #line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_search_text_changed ((SearchFilterToolbar*) self);
-#line 4874 "SearchFilter.c"
+#line 4958 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed (SearchFilterActions* _sender, gpointer self) {
 #line 1167 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_criteria_changed ((SearchFilterToolbar*) self);
-#line 4881 "SearchFilter.c"
+#line 4965 "SearchFilter.c"
 }
 
 
@@ -4886,28 +4970,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 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4890 "SearchFilter.c"
+#line 4974 "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 4897 "SearchFilter.c"
+#line 4981 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_context_menu_close_chosen ((SearchFilterToolbar*) self);
-#line 4904 "SearchFilter.c"
+#line 4988 "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 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_saved_search_button_clicked ((SearchFilterToolbar*) self);
-#line 4911 "SearchFilter.c"
+#line 4995 "SearchFilter.c"
 }
 
 
@@ -5051,7 +5135,7 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 	_tmp9_ = self->priv->toolbar;
 #line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_toolbar_set_icon_size (_tmp9_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 5055 "SearchFilter.c"
+#line 5139 "SearchFilter.c"
 	{
 		GtkBuilder* _tmp10_ = NULL;
 #line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5060,12 +5144,12 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 		gtk_builder_add_from_resource (_tmp10_, "/org/gnome/Shotwell/search_bar.ui", &_inner_error_);
 #line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5064 "SearchFilter.c"
-			goto __catch590_g_error;
+#line 5148 "SearchFilter.c"
+			goto __catch588_g_error;
 		}
 	}
-	goto __finally590;
-	__catch590_g_error:
+	goto __finally588;
+	__catch588_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp11_ = NULL;
@@ -5093,9 +5177,9 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 		_g_free0 (_tmp15_);
 #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_error_free0 (err);
-#line 5097 "SearchFilter.c"
+#line 5181 "SearchFilter.c"
 	}
-	__finally590:
+	__finally588:
 #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5104,7 +5188,7 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 		g_clear_error (&_inner_error_);
 #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return NULL;
-#line 5108 "SearchFilter.c"
+#line 5192 "SearchFilter.c"
 	}
 #line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp16_ = self->priv->close_item;
@@ -5408,14 +5492,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 5412 "SearchFilter.c"
+#line 5496 "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 5419 "SearchFilter.c"
+#line 5503 "SearchFilter.c"
 }
 
 
@@ -5430,77 +5514,77 @@ static void search_filter_toolbar_on_media_context_changed (SearchFilterToolbar*
 	_tmp0_ = has_photos;
 #line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 5434 "SearchFilter.c"
+#line 5518 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp1_ = NULL;
 #line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = self->priv->toolbtn_photos;
 #line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp1_, RESOURCES_ICON_FILTER_PHOTOS);
-#line 5440 "SearchFilter.c"
+#line 5524 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp2_ = NULL;
 #line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->toolbtn_photos;
 #line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp2_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED);
-#line 5447 "SearchFilter.c"
+#line 5531 "SearchFilter.c"
 	}
 #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = has_videos;
 #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_) {
-#line 5453 "SearchFilter.c"
+#line 5537 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp4_ = NULL;
 #line 1180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = self->priv->toolbtn_videos;
 #line 1180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp4_, RESOURCES_ICON_FILTER_VIDEOS);
-#line 5459 "SearchFilter.c"
+#line 5543 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp5_ = NULL;
 #line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = self->priv->toolbtn_videos;
 #line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp5_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED);
-#line 5466 "SearchFilter.c"
+#line 5550 "SearchFilter.c"
 	}
 #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = has_raw;
 #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp6_) {
-#line 5472 "SearchFilter.c"
+#line 5556 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp7_ = NULL;
 #line 1185 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = self->priv->toolbtn_raw;
 #line 1185 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp7_, RESOURCES_ICON_FILTER_RAW);
-#line 5478 "SearchFilter.c"
+#line 5562 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp8_ = NULL;
 #line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = self->priv->toolbtn_raw;
 #line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp8_, RESOURCES_ICON_FILTER_RAW_DISABLED);
-#line 5485 "SearchFilter.c"
+#line 5569 "SearchFilter.c"
 	}
 #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = has_flagged;
 #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp9_) {
-#line 5491 "SearchFilter.c"
+#line 5575 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp10_ = NULL;
 #line 1190 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = self->priv->toolbtn_flag;
 #line 1190 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp10_, RESOURCES_ICON_FILTER_FLAGGED);
-#line 5497 "SearchFilter.c"
+#line 5581 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp11_ = NULL;
 #line 1192 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp11_ = self->priv->toolbtn_flag;
 #line 1192 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp11_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED);
-#line 5504 "SearchFilter.c"
+#line 5588 "SearchFilter.c"
 	}
 }
 
@@ -5524,14 +5608,14 @@ static gboolean search_filter_toolbar_on_context_menu_requested (SearchFilterToo
 	result = FALSE;
 #line 1198 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5528 "SearchFilter.c"
+#line 5612 "SearchFilter.c"
 }
 
 
-static GVariant* _variant_new31 (gboolean value) {
+static GVariant* _variant_new39 (gboolean value) {
 #line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5535 "SearchFilter.c"
+#line 5619 "SearchFilter.c"
 }
 
 
@@ -5561,24 +5645,24 @@ static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterTool
 	_tmp4_ = action;
 #line 1213 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp4_ != NULL) {
-#line 5565 "SearchFilter.c"
+#line 5649 "SearchFilter.c"
 		GSimpleAction* _tmp5_ = NULL;
 		GVariant* _tmp6_ = NULL;
 #line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = action;
 #line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp6_ = _variant_new31 (FALSE);
+		_tmp6_ = _variant_new39 (FALSE);
 #line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		g_simple_action_set_state (_tmp5_, _tmp6_);
+		g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
 #line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp6_);
-#line 5576 "SearchFilter.c"
+#line 5660 "SearchFilter.c"
 	}
 #line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
 #line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 5582 "SearchFilter.c"
+#line 5666 "SearchFilter.c"
 }
 
 
@@ -5587,7 +5671,7 @@ static void search_filter_toolbar_on_flagged_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1220 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5591 "SearchFilter.c"
+#line 5675 "SearchFilter.c"
 }
 
 
@@ -5596,7 +5680,7 @@ static void search_filter_toolbar_on_videos_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5600 "SearchFilter.c"
+#line 5684 "SearchFilter.c"
 }
 
 
@@ -5605,7 +5689,7 @@ static void search_filter_toolbar_on_photos_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5609 "SearchFilter.c"
+#line 5693 "SearchFilter.c"
 }
 
 
@@ -5614,7 +5698,7 @@ static void search_filter_toolbar_on_raw_toggled (SearchFilterToolbar* self) {
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1232 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5618 "SearchFilter.c"
+#line 5702 "SearchFilter.c"
 }
 
 
@@ -5623,14 +5707,14 @@ static void search_filter_toolbar_on_search_text_changed (SearchFilterToolbar* s
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5627 "SearchFilter.c"
+#line 5711 "SearchFilter.c"
 }
 
 
-static GVariant* _variant_new32 (gboolean value) {
+static GVariant* _variant_new40 (gboolean value) {
 #line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5634 "SearchFilter.c"
+#line 5718 "SearchFilter.c"
 }
 
 
@@ -5657,7 +5741,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 		_g_object_unref0 (aw);
 #line 1243 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 5661 "SearchFilter.c"
+#line 5745 "SearchFilter.c"
 	}
 #line 1245 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = aw;
@@ -5671,18 +5755,18 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 	_tmp5_ = action;
 #line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp5_ != NULL) {
-#line 5675 "SearchFilter.c"
+#line 5759 "SearchFilter.c"
 		GSimpleAction* _tmp6_ = NULL;
 		GVariant* _tmp7_ = NULL;
 #line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = action;
 #line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp7_ = _variant_new32 (TRUE);
+		_tmp7_ = _variant_new40 (TRUE);
 #line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		g_simple_action_set_state (_tmp6_, _tmp7_);
+		g_signal_emit_by_name (_tmp6_, "change-state", _tmp7_);
 #line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp7_);
-#line 5686 "SearchFilter.c"
+#line 5770 "SearchFilter.c"
 	}
 #line 1253 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
@@ -5690,7 +5774,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 	_g_object_unref0 (action);
 #line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 5694 "SearchFilter.c"
+#line 5778 "SearchFilter.c"
 }
 
 
@@ -5699,14 +5783,14 @@ static void search_filter_toolbar_on_criteria_changed (SearchFilterToolbar* self
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5703 "SearchFilter.c"
+#line 5787 "SearchFilter.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 5710 "SearchFilter.c"
+#line 5794 "SearchFilter.c"
 }
 
 
@@ -5733,7 +5817,7 @@ void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchVie
 	if (_tmp0_ == _tmp1_) {
 #line 1265 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 5737 "SearchFilter.c"
+#line 5821 "SearchFilter.c"
 	}
 #line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search_filter;
@@ -5761,7 +5845,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 1273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5765 "SearchFilter.c"
+#line 5849 "SearchFilter.c"
 }
 
 
@@ -5778,7 +5862,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 1277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_view_filter_unref0 (_tmp1_);
-#line 5782 "SearchFilter.c"
+#line 5866 "SearchFilter.c"
 }
 
 
@@ -5871,7 +5955,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp0_ = self->priv->search_filter;
 #line 1282 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (NULL == _tmp0_) {
-#line 5875 "SearchFilter.c"
+#line 5959 "SearchFilter.c"
 		LibraryWindow* _tmp1_ = NULL;
 		LibraryWindow* _tmp2_ = NULL;
 #line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5882,7 +5966,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		library_window_show_search_bar (_tmp2_, TRUE);
 #line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp2_);
-#line 5886 "SearchFilter.c"
+#line 5970 "SearchFilter.c"
 	}
 #line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_filter;
@@ -6074,7 +6158,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp73_ = _tmp72_;
 #line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp73_) {
-#line 6078 "SearchFilter.c"
+#line 6162 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp74_ = NULL;
 		gboolean _tmp75_ = FALSE;
 		gboolean _tmp76_ = FALSE;
@@ -6086,11 +6170,11 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp76_ = _tmp75_;
 #line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = _tmp76_;
-#line 6090 "SearchFilter.c"
+#line 6174 "SearchFilter.c"
 	} else {
 #line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = FALSE;
-#line 6094 "SearchFilter.c"
+#line 6178 "SearchFilter.c"
 	}
 #line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp77_ = self->priv->sepr_mediatype_flagged;
@@ -6104,7 +6188,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp82_ = _tmp81_;
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp82_) {
-#line 6108 "SearchFilter.c"
+#line 6192 "SearchFilter.c"
 		SearchFilterToolbarRatingFilterButton* _tmp83_ = NULL;
 		gboolean _tmp84_ = FALSE;
 		gboolean _tmp85_ = FALSE;
@@ -6116,17 +6200,17 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp85_ = _tmp84_;
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = _tmp85_;
-#line 6120 "SearchFilter.c"
+#line 6204 "SearchFilter.c"
 	} else {
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = FALSE;
-#line 6124 "SearchFilter.c"
+#line 6208 "SearchFilter.c"
 	}
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp79_) {
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = TRUE;
-#line 6130 "SearchFilter.c"
+#line 6214 "SearchFilter.c"
 	} else {
 		gboolean _tmp86_ = FALSE;
 		SearchFilterToolbarToggleActionToolButton* _tmp87_ = NULL;
@@ -6140,7 +6224,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp89_ = _tmp88_;
 #line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp89_) {
-#line 6144 "SearchFilter.c"
+#line 6228 "SearchFilter.c"
 			SearchFilterToolbarRatingFilterButton* _tmp90_ = NULL;
 			gboolean _tmp91_ = FALSE;
 			gboolean _tmp92_ = FALSE;
@@ -6152,15 +6236,15 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 			_tmp92_ = _tmp91_;
 #line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = _tmp92_;
-#line 6156 "SearchFilter.c"
+#line 6240 "SearchFilter.c"
 		} else {
 #line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = FALSE;
-#line 6160 "SearchFilter.c"
+#line 6244 "SearchFilter.c"
 		}
 #line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = _tmp86_;
-#line 6164 "SearchFilter.c"
+#line 6248 "SearchFilter.c"
 	}
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp93_ = self->priv->sepr_flagged_rating;
@@ -6170,7 +6254,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp94_ = self->priv->search_filter;
 #line 1328 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6174 "SearchFilter.c"
+#line 6258 "SearchFilter.c"
 }
 
 
@@ -6191,7 +6275,7 @@ static void search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar*
 	self->priv->saved_search = _tmp1_;
 #line 1333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6195 "SearchFilter.c"
+#line 6279 "SearchFilter.c"
 }
 
 
@@ -6204,7 +6288,7 @@ static void search_filter_toolbar_disable_savedsearch (SearchFilterToolbar* self
 	self->priv->saved_search = NULL;
 #line 1338 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6208 "SearchFilter.c"
+#line 6292 "SearchFilter.c"
 }
 
 
@@ -6234,7 +6318,7 @@ static void search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, SavedS
 	saved_search_dialog_show (ssd);
 #line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (ssd);
-#line 6238 "SearchFilter.c"
+#line 6322 "SearchFilter.c"
 }
 
 
@@ -6259,7 +6343,7 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save
 	_tmp3_ = dialogs_confirm_delete_saved_search (_tmp2_);
 #line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_) {
-#line 6263 "SearchFilter.c"
+#line 6347 "SearchFilter.c"
 		CommandManager* _tmp4_ = NULL;
 		CommandManager* _tmp5_ = NULL;
 		SavedSearch* _tmp6_ = NULL;
@@ -6281,7 +6365,7 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save
 		_g_object_unref0 (_tmp8_);
 #line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 6285 "SearchFilter.c"
+#line 6369 "SearchFilter.c"
 	}
 }
 
@@ -6307,7 +6391,7 @@ static void search_filter_toolbar_add_dialog (SearchFilterToolbar* self) {
 	saved_search_dialog_show (_tmp3_);
 #line 1355 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (_tmp3_);
-#line 6311 "SearchFilter.c"
+#line 6395 "SearchFilter.c"
 }
 
 
@@ -6332,42 +6416,42 @@ static void search_filter_toolbar_on_popover_closed (SearchFilterToolbar* self)
 	_tmp3_ = _tmp2_->filter_popup;
 #line 1362 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp3_);
-#line 6336 "SearchFilter.c"
+#line 6420 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
 #line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_edit_dialog ((SearchFilterToolbar*) self, search);
-#line 6343 "SearchFilter.c"
+#line 6427 "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 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_savedsearch_selected ((SearchFilterToolbar*) self, search);
-#line 6350 "SearchFilter.c"
+#line 6434 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
 #line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_delete_dialog ((SearchFilterToolbar*) self, search);
-#line 6357 "SearchFilter.c"
+#line 6441 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
 #line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_add_dialog ((SearchFilterToolbar*) self);
-#line 6364 "SearchFilter.c"
+#line 6448 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
 #line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_popover_closed ((SearchFilterToolbar*) self);
-#line 6371 "SearchFilter.c"
+#line 6455 "SearchFilter.c"
 }
 
 
@@ -6380,28 +6464,28 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 	_tmp1_ = self->priv->elide_showing_again;
 #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 6384 "SearchFilter.c"
+#line 6468 "SearchFilter.c"
 		SavedSearch* _tmp2_ = NULL;
 #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->saved_search;
 #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 6390 "SearchFilter.c"
+#line 6474 "SearchFilter.c"
 	} else {
 #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 6394 "SearchFilter.c"
+#line 6478 "SearchFilter.c"
 	}
 #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 6398 "SearchFilter.c"
+#line 6482 "SearchFilter.c"
 	} else {
 		SavedSearch* _tmp3_ = NULL;
 #line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->saved_search;
 #line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp3_ != NULL) {
-#line 6405 "SearchFilter.c"
+#line 6489 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchFilterButton* _tmp4_ = NULL;
 #line 1368 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (self->priv->saved_search);
@@ -6413,7 +6497,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			search_filter_toolbar_saved_search_filter_button_set_active (_tmp4_, FALSE);
 #line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_disable_savedsearch (self);
-#line 6417 "SearchFilter.c"
+#line 6501 "SearchFilter.c"
 		} else {
 			SearchFilterToolbarSavedSearchFilterButton* _tmp5_ = NULL;
 			SearchFilterToolbarSavedSearchPopover* _tmp6_ = NULL;
@@ -6438,7 +6522,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			_tmp6_ = _tmp5_->filter_popup;
 #line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp6_ != NULL) {
-#line 6442 "SearchFilter.c"
+#line 6526 "SearchFilter.c"
 				SearchFilterToolbarSavedSearchFilterButton* _tmp7_ = NULL;
 				SearchFilterToolbarSavedSearchPopover* _tmp8_ = NULL;
 				guint _tmp9_ = 0U;
@@ -6494,7 +6578,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 1377 "/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 6498 "SearchFilter.c"
+#line 6582 "SearchFilter.c"
 			}
 #line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp22_ = self->priv->saved_search_button;
@@ -6542,12 +6626,12 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			_tmp36_ = _tmp35_->filter_popup;
 #line 1386 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_saved_search_popover_show_all (_tmp36_);
-#line 6546 "SearchFilter.c"
+#line 6630 "SearchFilter.c"
 		}
 	}
 #line 1388 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->elide_showing_again = FALSE;
-#line 6551 "SearchFilter.c"
+#line 6635 "SearchFilter.c"
 }
 
 
@@ -6559,7 +6643,7 @@ void search_filter_toolbar_take_focus (SearchFilterToolbar* self) {
 	_tmp0_ = self->priv->search_box;
 #line 1392 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_get_focus (_tmp0_);
-#line 6563 "SearchFilter.c"
+#line 6647 "SearchFilter.c"
 }
 
 
@@ -6570,110 +6654,110 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
 	GtkLabel* _tmp11_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (s != NULL, NULL);
-#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarLabelToolItem*) g_object_new (object_type, NULL);
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = s;
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = (GtkLabel*) gtk_label_new (_tmp0_);
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp1_);
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->label);
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->label = _tmp1_;
-#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = left_padding;
-#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_ != 0) {
-#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = TRUE;
-#line 6594 "SearchFilter.c"
+#line 6678 "SearchFilter.c"
 	} else {
 		gint _tmp4_ = 0;
-#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = right_padding;
-#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp4_ != 0;
-#line 6601 "SearchFilter.c"
+#line 6685 "SearchFilter.c"
 	}
-#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_) {
-#line 6605 "SearchFilter.c"
+#line 6689 "SearchFilter.c"
 		GtkLabel* _tmp5_ = NULL;
 		GtkLabel* _tmp6_ = NULL;
 		GtkLabel* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		GtkLabel* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = self->priv->label;
-#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = self->priv->label;
-#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = self->priv->label;
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = left_padding;
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp8_);
-#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 626 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp9_ = self->priv->label;
-#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 626 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = right_padding;
-#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#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 6632 "SearchFilter.c"
+#line 6716 "SearchFilter.c"
 	}
-#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = self->priv->label;
-#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 6640 "SearchFilter.c"
+#line 6724 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_new (const gchar* s, gint left_padding, gint right_padding) {
-#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#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 6647 "SearchFilter.c"
+#line 6731 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_label_tool_item_class_init (SearchFilterToolbarLabelToolItemClass * klass) {
-#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_label_tool_item_parent_class = g_type_class_peek_parent (klass);
-#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarLabelToolItemPrivate));
-#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_label_tool_item_finalize;
-#line 6658 "SearchFilter.c"
+#line 6742 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_label_tool_item_instance_init (SearchFilterToolbarLabelToolItem * self) {
-#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_GET_PRIVATE (self);
-#line 6665 "SearchFilter.c"
+#line 6749 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_label_tool_item_finalize (GObject* obj) {
 	SearchFilterToolbarLabelToolItem * self;
-#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_LABEL_TOOL_ITEM, SearchFilterToolbarLabelToolItem);
-#line 615 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->label);
-#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_label_tool_item_parent_class)->finalize (obj);
-#line 6677 "SearchFilter.c"
+#line 6761 "SearchFilter.c"
 }
 
 
@@ -6699,54 +6783,54 @@ static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_a
 	GtkToggleButton* _tmp5_ = NULL;
 	GtkToggleButton* _tmp6_ = NULL;
 	GtkToggleButton* _tmp7_ = NULL;
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (action != NULL, NULL);
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarToggleActionToolButton*) g_object_new (object_type, NULL);
-#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = (GtkToggleButton*) gtk_toggle_button_new ();
-#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp0_);
-#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->button);
-#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->button = _tmp0_;
-#line 634 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->button;
-#line 634 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->button;
-#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = action;
-#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_ACTIONABLE, GtkActionable), _tmp3_);
-#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 639 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->button;
-#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 639 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->button;
-#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE);
-#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 641 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = self->priv->button;
-#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 641 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 2);
-#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = self->priv->button;
-#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 6743 "SearchFilter.c"
+#line 6827 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_new (const gchar* action) {
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#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 6750 "SearchFilter.c"
+#line 6834 "SearchFilter.c"
 }
 
 
@@ -6754,68 +6838,43 @@ static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (Searc
 	GtkImage* image = NULL;
 	GtkToggleButton* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GtkImage* _tmp7_ = NULL;
-	GtkToggleButton* _tmp8_ = NULL;
-	GtkImage* _tmp9_ = NULL;
-#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkImage* _tmp2_ = NULL;
+	GtkImage* _tmp3_ = NULL;
+	GtkToggleButton* _tmp4_ = NULL;
+	GtkImage* _tmp5_ = NULL;
+#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_TOGGLE_ACTION_TOOL_BUTTON (self));
-#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (icon_name != NULL);
-#line 644 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	image = NULL;
-#line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 648 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->button;
-#line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 648 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_always_show_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), TRUE);
-#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = icon_name;
-#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = string_contains (_tmp1_, "disabled");
-#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp2_) {
-#line 6778 "SearchFilter.c"
-		const gchar* _tmp3_ = NULL;
-		GtkImage* _tmp4_ = NULL;
-#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp3_ = icon_name;
-#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp4_ = (GtkImage*) gtk_image_new_from_stock (_tmp3_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		g_object_ref_sink (_tmp4_);
-#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_g_object_unref0 (image);
-#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		image = _tmp4_;
-#line 6791 "SearchFilter.c"
-	} else {
-		const gchar* _tmp5_ = NULL;
-		GtkImage* _tmp6_ = NULL;
 #line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp5_ = icon_name;
+	_tmp1_ = icon_name;
 #line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp6_ = (GtkImage*) gtk_image_new_from_icon_name (_tmp5_, GTK_ICON_SIZE_SMALL_TOOLBAR);
+	_tmp2_ = (GtkImage*) gtk_image_new_from_icon_name (_tmp1_, GTK_ICON_SIZE_SMALL_TOOLBAR);
 #line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		g_object_ref_sink (_tmp6_);
+	g_object_ref_sink (_tmp2_);
 #line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_g_object_unref0 (image);
+	_g_object_unref0 (image);
 #line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		image = _tmp6_;
-#line 6805 "SearchFilter.c"
-	}
+	image = _tmp2_;
 #line 650 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp7_ = image;
+	_tmp3_ = image;
 #line 650 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 6);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), 6);
 #line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp8_ = self->priv->button;
+	_tmp4_ = self->priv->button;
 #line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_ = image;
+	_tmp5_ = image;
 #line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_button_get_type (), GtkButton), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
+#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (image);
-#line 6819 "SearchFilter.c"
+#line 6878 "SearchFilter.c"
 }
 
 
@@ -6832,37 +6891,37 @@ 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 6836 "SearchFilter.c"
+#line 6895 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_class_init (SearchFilterToolbarToggleActionToolButtonClass * klass) {
-#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_toggle_action_tool_button_parent_class = g_type_class_peek_parent (klass);
-#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarToggleActionToolButtonPrivate));
-#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_toggle_action_tool_button_finalize;
-#line 6847 "SearchFilter.c"
+#line 6906 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_instance_init (SearchFilterToolbarToggleActionToolButton * self) {
-#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_GET_PRIVATE (self);
-#line 6854 "SearchFilter.c"
+#line 6913 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject* obj) {
 	SearchFilterToolbarToggleActionToolButton * self;
-#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_TOGGLE_ACTION_TOOL_BUTTON, SearchFilterToolbarToggleActionToolButton);
-#line 630 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->button);
-#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_toggle_action_tool_button_parent_class)->finalize (obj);
-#line 6866 "SearchFilter.c"
+#line 6925 "SearchFilter.c"
 }
 
 
@@ -6881,42 +6940,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 6885 "SearchFilter.c"
+#line 6944 "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 6892 "SearchFilter.c"
+#line 6951 "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 6899 "SearchFilter.c"
+#line 6958 "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 6906 "SearchFilter.c"
+#line 6965 "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 6913 "SearchFilter.c"
+#line 6972 "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 6920 "SearchFilter.c"
+#line 6979 "SearchFilter.c"
 }
 
 
@@ -6925,7 +6984,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 6929 "SearchFilter.c"
+#line 6988 "SearchFilter.c"
 }
 
 
@@ -7019,14 +7078,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 7023 "SearchFilter.c"
+#line 7082 "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 7030 "SearchFilter.c"
+#line 7089 "SearchFilter.c"
 }
 
 
@@ -7038,7 +7097,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 7042 "SearchFilter.c"
+#line 7101 "SearchFilter.c"
 }
 
 
@@ -7059,19 +7118,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 7063 "SearchFilter.c"
+#line 7122 "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 7069 "SearchFilter.c"
+#line 7128 "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 7075 "SearchFilter.c"
+#line 7134 "SearchFilter.c"
 }
 
 
@@ -7133,7 +7192,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 7137 "SearchFilter.c"
+#line 7196 "SearchFilter.c"
 }
 
 
@@ -7164,7 +7223,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 7168 "SearchFilter.c"
+#line 7227 "SearchFilter.c"
 }
 
 
@@ -7176,7 +7235,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 7180 "SearchFilter.c"
+#line 7239 "SearchFilter.c"
 }
 
 
@@ -7188,7 +7247,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 7192 "SearchFilter.c"
+#line 7251 "SearchFilter.c"
 }
 
 
@@ -7202,23 +7261,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 7206 "SearchFilter.c"
+#line 7265 "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 7212 "SearchFilter.c"
+#line 7271 "SearchFilter.c"
 	} else {
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = "";
-#line 7216 "SearchFilter.c"
+#line 7275 "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 7222 "SearchFilter.c"
+#line 7281 "SearchFilter.c"
 }
 
 
@@ -7229,14 +7288,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 7233 "SearchFilter.c"
+#line 7292 "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 7240 "SearchFilter.c"
+#line 7299 "SearchFilter.c"
 }
 
 
@@ -7302,7 +7361,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 7306 "SearchFilter.c"
+#line 7365 "SearchFilter.c"
 }
 
 
@@ -7378,14 +7437,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 7382 "SearchFilter.c"
+#line 7441 "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 7389 "SearchFilter.c"
+#line 7448 "SearchFilter.c"
 }
 
 
@@ -7411,7 +7470,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 7415 "SearchFilter.c"
+#line 7474 "SearchFilter.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7422,11 +7481,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 7426 "SearchFilter.c"
+#line 7485 "SearchFilter.c"
 		}
 #line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 7430 "SearchFilter.c"
+#line 7489 "SearchFilter.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 767 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7437,12 +7496,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 7441 "SearchFilter.c"
+#line 7500 "SearchFilter.c"
 		}
 		default:
 #line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 7446 "SearchFilter.c"
+#line 7505 "SearchFilter.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7453,7 +7512,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 7457 "SearchFilter.c"
+#line 7516 "SearchFilter.c"
 		}
 	}
 #line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7484,7 +7543,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 7488 "SearchFilter.c"
+#line 7547 "SearchFilter.c"
 }
 
 
@@ -7508,7 +7567,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 7512 "SearchFilter.c"
+#line 7571 "SearchFilter.c"
 		{
 			gint _tmp1_ = 0;
 			gint _tmp2_ = 0;
@@ -7520,11 +7579,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 7524 "SearchFilter.c"
+#line 7583 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 7528 "SearchFilter.c"
+#line 7587 "SearchFilter.c"
 		{
 			gint _tmp3_ = 0;
 			gint _tmp4_ = 0;
@@ -7536,11 +7595,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 7540 "SearchFilter.c"
+#line 7599 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 7544 "SearchFilter.c"
+#line 7603 "SearchFilter.c"
 		{
 			gint _tmp5_ = 0;
 			gint _tmp6_ = 0;
@@ -7552,11 +7611,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 7556 "SearchFilter.c"
+#line 7615 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 7560 "SearchFilter.c"
+#line 7619 "SearchFilter.c"
 		{
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
@@ -7568,13 +7627,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 7572 "SearchFilter.c"
+#line 7631 "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 7578 "SearchFilter.c"
+#line 7637 "SearchFilter.c"
 		{
 			gint _tmp9_ = 0;
 #line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7583,37 +7642,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 7587 "SearchFilter.c"
+#line 7646 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 7591 "SearchFilter.c"
+#line 7650 "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 7597 "SearchFilter.c"
+#line 7656 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 7601 "SearchFilter.c"
+#line 7660 "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 7607 "SearchFilter.c"
+#line 7666 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 7611 "SearchFilter.c"
+#line 7670 "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 7617 "SearchFilter.c"
+#line 7676 "SearchFilter.c"
 		}
 		default:
 		{
@@ -7621,7 +7680,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 7625 "SearchFilter.c"
+#line 7684 "SearchFilter.c"
 		}
 	}
 }
@@ -7647,7 +7706,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 7651 "SearchFilter.c"
+#line 7710 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp2_ = NULL;
 			const gchar* _tmp3_ = NULL;
@@ -7659,11 +7718,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 7663 "SearchFilter.c"
+#line 7722 "SearchFilter.c"
 		}
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 7667 "SearchFilter.c"
+#line 7726 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp4_ = NULL;
 			const gchar* _tmp5_ = NULL;
@@ -7675,11 +7734,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 7679 "SearchFilter.c"
+#line 7738 "SearchFilter.c"
 		}
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 7683 "SearchFilter.c"
+#line 7742 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp6_ = NULL;
 			const gchar* _tmp7_ = NULL;
@@ -7691,11 +7750,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 7695 "SearchFilter.c"
+#line 7754 "SearchFilter.c"
 		}
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 7699 "SearchFilter.c"
+#line 7758 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp8_ = NULL;
 			const gchar* _tmp9_ = NULL;
@@ -7707,13 +7766,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 7711 "SearchFilter.c"
+#line 7770 "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 7717 "SearchFilter.c"
+#line 7776 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp10_ = NULL;
 			const gchar* _tmp11_ = NULL;
@@ -7725,7 +7784,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 7729 "SearchFilter.c"
+#line 7788 "SearchFilter.c"
 		}
 		default:
 		{
@@ -7755,7 +7814,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 7759 "SearchFilter.c"
+#line 7818 "SearchFilter.c"
 		}
 	}
 #line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7778,7 +7837,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 7782 "SearchFilter.c"
+#line 7841 "SearchFilter.c"
 }
 
 
@@ -7796,7 +7855,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 7800 "SearchFilter.c"
+#line 7859 "SearchFilter.c"
 }
 
 
@@ -7813,7 +7872,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 7817 "SearchFilter.c"
+#line 7876 "SearchFilter.c"
 }
 
 
@@ -7822,7 +7881,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 7826 "SearchFilter.c"
+#line 7885 "SearchFilter.c"
 }
 
 
@@ -7838,7 +7897,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 7842 "SearchFilter.c"
+#line 7901 "SearchFilter.c"
 }
 
 
@@ -7857,7 +7916,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 7861 "SearchFilter.c"
+#line 7920 "SearchFilter.c"
 }
 
 
@@ -7917,14 +7976,14 @@ SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_f
 	_g_object_unref0 (image);
 #line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7921 "SearchFilter.c"
+#line 7980 "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 7928 "SearchFilter.c"
+#line 7987 "SearchFilter.c"
 }
 
 
@@ -7933,7 +7992,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 7937 "SearchFilter.c"
+#line 7996 "SearchFilter.c"
 }
 
 
@@ -7948,7 +8007,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 7952 "SearchFilter.c"
+#line 8011 "SearchFilter.c"
 }
 
 
@@ -7965,7 +8024,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 7969 "SearchFilter.c"
+#line 8028 "SearchFilter.c"
 }
 
 
@@ -7982,7 +8041,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 7986 "SearchFilter.c"
+#line 8045 "SearchFilter.c"
 }
 
 
@@ -7993,14 +8052,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 7997 "SearchFilter.c"
+#line 8056 "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 8004 "SearchFilter.c"
+#line 8063 "SearchFilter.c"
 }
 
 
@@ -8022,7 +8081,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 8026 "SearchFilter.c"
+#line 8085 "SearchFilter.c"
 }
 
 
@@ -8041,35 +8100,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 8045 "SearchFilter.c"
+#line 8104 "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 8052 "SearchFilter.c"
+#line 8111 "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 8059 "SearchFilter.c"
+#line 8118 "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 8066 "SearchFilter.c"
+#line 8125 "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 8073 "SearchFilter.c"
+#line 8132 "SearchFilter.c"
 }
 
 
@@ -8080,13 +8139,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 8084 "SearchFilter.c"
+#line 8143 "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 8090 "SearchFilter.c"
+#line 8149 "SearchFilter.c"
 }
 
 
@@ -8097,13 +8156,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 8101 "SearchFilter.c"
+#line 8160 "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 8107 "SearchFilter.c"
+#line 8166 "SearchFilter.c"
 }
 
 
@@ -8169,7 +8228,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 8173 "SearchFilter.c"
+#line 8232 "SearchFilter.c"
 	{
 		GeeIterator* _search_it = NULL;
 		SavedSearchTable* _tmp6_ = NULL;
@@ -8198,7 +8257,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 		_search_it = _tmp11_;
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		while (TRUE) {
-#line 8202 "SearchFilter.c"
+#line 8261 "SearchFilter.c"
 			GeeIterator* _tmp12_ = NULL;
 			gboolean _tmp13_ = FALSE;
 			SavedSearch* search = NULL;
@@ -8246,7 +8305,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 			if (!_tmp13_) {
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				break;
-#line 8250 "SearchFilter.c"
+#line 8309 "SearchFilter.c"
 			}
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp14_ = _search_it;
@@ -8362,11 +8421,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 8366 "SearchFilter.c"
+#line 8425 "SearchFilter.c"
 		}
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_search_it);
-#line 8370 "SearchFilter.c"
+#line 8429 "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);
@@ -8404,14 +8463,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 8408 "SearchFilter.c"
+#line 8467 "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 8415 "SearchFilter.c"
+#line 8474 "SearchFilter.c"
 }
 
 
@@ -8431,7 +8490,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 8435 "SearchFilter.c"
+#line 8494 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -8443,14 +8502,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 8447 "SearchFilter.c"
+#line 8506 "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 8454 "SearchFilter.c"
+#line 8513 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp3_ = NULL;
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8459,7 +8518,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 8463 "SearchFilter.c"
+#line 8522 "SearchFilter.c"
 			}
 		}
 	}
@@ -8467,7 +8526,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 8471 "SearchFilter.c"
+#line 8530 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -8479,14 +8538,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 8483 "SearchFilter.c"
+#line 8542 "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 8490 "SearchFilter.c"
+#line 8549 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL;
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8495,7 +8554,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 8499 "SearchFilter.c"
+#line 8558 "SearchFilter.c"
 			}
 		}
 	}
@@ -8523,7 +8582,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 8527 "SearchFilter.c"
+#line 8586 "SearchFilter.c"
 	}
 #line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = row;
@@ -8545,13 +8604,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 8549 "SearchFilter.c"
+#line 8608 "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 8555 "SearchFilter.c"
+#line 8614 "SearchFilter.c"
 }
 
 
@@ -8622,7 +8681,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 8626 "SearchFilter.c"
+#line 8685 "SearchFilter.c"
 }
 
 
@@ -8640,7 +8699,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 8644 "SearchFilter.c"
+#line 8703 "SearchFilter.c"
 		GtkListBoxRow* _tmp2_ = NULL;
 		SavedSearch* _tmp3_ = NULL;
 		SavedSearch* _tmp4_ = NULL;
@@ -8654,13 +8713,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 8658 "SearchFilter.c"
+#line 8717 "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 8664 "SearchFilter.c"
+#line 8723 "SearchFilter.c"
 }
 
 
@@ -8674,7 +8733,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 8678 "SearchFilter.c"
+#line 8737 "SearchFilter.c"
 }
 
 
@@ -8688,7 +8747,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 8692 "SearchFilter.c"
+#line 8751 "SearchFilter.c"
 }
 
 
@@ -8697,7 +8756,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 8701 "SearchFilter.c"
+#line 8760 "SearchFilter.c"
 }
 
 
@@ -8706,7 +8765,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 8710 "SearchFilter.c"
+#line 8769 "SearchFilter.c"
 }
 
 
@@ -8718,7 +8777,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 8722 "SearchFilter.c"
+#line 8781 "SearchFilter.c"
 }
 
 
@@ -8730,14 +8789,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 8734 "SearchFilter.c"
+#line 8793 "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 8741 "SearchFilter.c"
+#line 8800 "SearchFilter.c"
 }
 
 
@@ -8780,14 +8839,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 8784 "SearchFilter.c"
+#line 8843 "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 8791 "SearchFilter.c"
+#line 8850 "SearchFilter.c"
 }
 
 
@@ -8804,7 +8863,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 8808 "SearchFilter.c"
+#line 8867 "SearchFilter.c"
 }
 
 
@@ -8816,7 +8875,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 8820 "SearchFilter.c"
+#line 8879 "SearchFilter.c"
 }
 
 
@@ -8831,7 +8890,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 8835 "SearchFilter.c"
+#line 8894 "SearchFilter.c"
 }
 
 
@@ -8850,7 +8909,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 8854 "SearchFilter.c"
+#line 8913 "SearchFilter.c"
 }
 
 
@@ -8869,7 +8928,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 8873 "SearchFilter.c"
+#line 8932 "SearchFilter.c"
 }
 
 
@@ -8878,7 +8937,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 8882 "SearchFilter.c"
+#line 8941 "SearchFilter.c"
 }
 
 
@@ -8900,7 +8959,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 8904 "SearchFilter.c"
+#line 8963 "SearchFilter.c"
 }
 
 
@@ -8927,13 +8986,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 8931 "SearchFilter.c"
+#line 8990 "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 8937 "SearchFilter.c"
+#line 8996 "SearchFilter.c"
 	}
 }
 
@@ -8949,13 +9008,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 8953 "SearchFilter.c"
+#line 9012 "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 8959 "SearchFilter.c"
+#line 9018 "SearchFilter.c"
 	}
 }
 
@@ -8963,7 +9022,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 8967 "SearchFilter.c"
+#line 9026 "SearchFilter.c"
 }
 
 
@@ -8972,7 +9031,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 8976 "SearchFilter.c"
+#line 9035 "SearchFilter.c"
 	}
 }
 
@@ -8982,11 +9041,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 8986 "SearchFilter.c"
+#line 9045 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8990 "SearchFilter.c"
+#line 9049 "SearchFilter.c"
 	}
 }
 
@@ -8994,37 +9053,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 8998 "SearchFilter.c"
+#line 9057 "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 9005 "SearchFilter.c"
+#line 9064 "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 9012 "SearchFilter.c"
+#line 9071 "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 9016 "SearchFilter.c"
+#line 9075 "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 9020 "SearchFilter.c"
+#line 9079 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9024 "SearchFilter.c"
+#line 9083 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 9028 "SearchFilter.c"
+#line 9087 "SearchFilter.c"
 }
 
 
@@ -9035,25 +9094,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 9039 "SearchFilter.c"
+#line 9098 "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 9045 "SearchFilter.c"
+#line 9104 "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 9049 "SearchFilter.c"
+#line 9108 "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 9053 "SearchFilter.c"
+#line 9112 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 9057 "SearchFilter.c"
+#line 9116 "SearchFilter.c"
 }
 
 
@@ -9067,7 +9126,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 9071 "SearchFilter.c"
+#line 9130 "SearchFilter.c"
 }
 
 
@@ -9076,7 +9135,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 9080 "SearchFilter.c"
+#line 9139 "SearchFilter.c"
 }
 
 
@@ -9096,17 +9155,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 9100 "SearchFilter.c"
+#line 9159 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9104 "SearchFilter.c"
+#line 9163 "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 9110 "SearchFilter.c"
+#line 9169 "SearchFilter.c"
 	}
 }
 
@@ -9125,17 +9184,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 9129 "SearchFilter.c"
+#line 9188 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9133 "SearchFilter.c"
+#line 9192 "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 9139 "SearchFilter.c"
+#line 9198 "SearchFilter.c"
 	}
 }
 
@@ -9157,7 +9216,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 9161 "SearchFilter.c"
+#line 9220 "SearchFilter.c"
 }
 
 
@@ -9184,7 +9243,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 9188 "SearchFilter.c"
+#line 9247 "SearchFilter.c"
 }
 
 
@@ -9208,7 +9267,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 9212 "SearchFilter.c"
+#line 9271 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -9220,14 +9279,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 9224 "SearchFilter.c"
+#line 9283 "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 9231 "SearchFilter.c"
+#line 9290 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_ = NULL;
 				guint _tmp3_ = 0U;
@@ -9239,7 +9298,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 9243 "SearchFilter.c"
+#line 9302 "SearchFilter.c"
 			}
 		}
 	}
@@ -9247,7 +9306,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 9251 "SearchFilter.c"
+#line 9310 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -9259,14 +9318,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 9263 "SearchFilter.c"
+#line 9322 "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 9270 "SearchFilter.c"
+#line 9329 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL;
 				guint _tmp7_ = 0U;
@@ -9278,7 +9337,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 9282 "SearchFilter.c"
+#line 9341 "SearchFilter.c"
 			}
 		}
 	}
@@ -9310,7 +9369,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 9314 "SearchFilter.c"
+#line 9373 "SearchFilter.c"
 }
 
 
@@ -9335,7 +9394,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 9339 "SearchFilter.c"
+#line 9398 "SearchFilter.c"
 }
 
 
@@ -9348,19 +9407,19 @@ 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 9352 "SearchFilter.c"
+#line 9411 "SearchFilter.c"
 	}
 }
 
 
 static void search_filter_toolbar_class_init (SearchFilterToolbarClass * klass) {
-#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_parent_class = g_type_class_peek_parent (klass);
-#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarPrivate));
-#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_finalize;
-#line 9364 "SearchFilter.c"
+#line 9423 "SearchFilter.c"
 }
 
 
@@ -9369,7 +9428,7 @@ static void search_filter_toolbar_instance_init (SearchFilterToolbar * self) {
 	GtkMenuItem* _tmp1_ = NULL;
 	GtkBuilder* _tmp2_ = NULL;
 	SearchFilterToolbarSavedSearchFilterButton* _tmp3_ = NULL;
-#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_GET_PRIVATE (self);
 #line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = (GtkMenu*) gtk_menu_new ();
@@ -9399,7 +9458,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 9403 "SearchFilter.c"
+#line 9462 "SearchFilter.c"
 }
 
 
@@ -9423,7 +9482,7 @@ static void search_filter_toolbar_finalize (GObject* obj) {
 	guint _tmp15_ = 0U;
 	GtkToolbar* _tmp16_ = NULL;
 	guint _tmp17_ = 0U;
-#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_FILTER_TOOLBAR, SearchFilterToolbar);
 #line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->actions;
@@ -9479,7 +9538,7 @@ static void search_filter_toolbar_finalize (GObject* obj) {
 	g_signal_parse_name ("popup-context-menu", gtk_toolbar_get_type (), &_tmp17_, NULL, FALSE);
 #line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self);
-#line 604 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 607 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbar);
 #line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->close_menu);
@@ -9515,9 +9574,9 @@ static void search_filter_toolbar_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->sepr_flagged_rating);
 #line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_rating_saved);
-#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_parent_class)->finalize (obj);
-#line 9521 "SearchFilter.c"
+#line 9580 "SearchFilter.c"
 }
 
 
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index a080884..3429c02 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -436,12 +436,12 @@ public class SearchFilterActions {
     }
     
     public void reset() {
-        rating.set_enabled (false);
-        photos.set_enabled (false);
-        raw.set_enabled (false);
-        videos.set_enabled (false);
-        Variant v = "'%d'".printf (RatingFilter.UNRATED_OR_HIGHER);
-        rating.set_state (v);
+        flagged.change_state (false);
+        photos.change_state (false);
+        raw.change_state (false);
+        videos.change_state (false);
+        Variant v = "%d".printf (RatingFilter.UNRATED_OR_HIGHER);
+        rating.change_state (v);
 
         text.set_text(null);
     }
@@ -554,8 +554,11 @@ public class SearchFilterActions {
 
     private void on_rating_changed (GLib.SimpleAction action,
                                     GLib.Variant      value) {
-        action.set_state (value);
+        if (value.get_string () == action.get_state().get_string ())
+            return;
+
         var filter = (RatingFilter) int.parse (value.get_string ());
+        action.set_state (value);
         rating_changed(filter);
     }
     
@@ -643,10 +646,7 @@ public class SearchFilterToolbar : Gtk.Revealer {
         public void set_icon_name(string icon_name) {
             Gtk.Image? image = null;
             button.set_always_show_image(true);
-            if (icon_name.contains("disabled"))
-                image = new Gtk.Image.from_stock(icon_name, Gtk.IconSize.SMALL_TOOLBAR);
-            else
-                image = new Gtk.Image.from_icon_name(icon_name, Gtk.IconSize.SMALL_TOOLBAR);
+            image = new Gtk.Image.from_icon_name(icon_name, Gtk.IconSize.SMALL_TOOLBAR);
             image.set_margin_end(6);
             button.set_image(image);
         }
@@ -1212,7 +1212,7 @@ public class SearchFilterToolbar : Gtk.Revealer {
         // Could we find the appropriate action?
         if(action != null) {
             // Yes, hide the search bar.
-            action.set_state(false);
+            action.change_state(false);
         }
     }
     
@@ -1247,7 +1247,7 @@ public class SearchFilterToolbar : Gtk.Revealer {
 
         // Could we find the appropriate action?
         if(action != null) {
-            action.set_state(true);
+            action.change_state(true);
         }
 
         update();
diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c
index 8fce3ed..70feead 100644
--- a/src/SlideshowPage.c
+++ b/src/SlideshowPage.c
@@ -1,4 +1,4 @@
-/* SlideshowPage.c generated by valac 0.34.2, the Vala compiler
+/* SlideshowPage.c generated by valac 0.32.1, the Vala compiler
  * generated from SlideshowPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1106,7 +1106,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 #line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1109 "SlideshowPage.c"
-					goto __catch460_g_error;
+					goto __catch458_g_error;
 				}
 #line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp7_ = _tmp3_;
@@ -1120,8 +1120,8 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_g_object_unref0 (_tmp3_);
 #line 1122 "SlideshowPage.c"
 			}
-			goto __finally460;
-			__catch460_g_error:
+			goto __finally458;
+			__catch458_g_error:
 			{
 				GError* err = NULL;
 				Photo* _tmp8_ = NULL;
@@ -1330,7 +1330,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				continue;
 #line 1332 "SlideshowPage.c"
 			}
-			__finally460:
+			__finally458:
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
diff --git a/src/SortedList.c b/src/SortedList.c
index 5704642..85f22a9 100644
--- a/src/SortedList.c
+++ b/src/SortedList.c
@@ -1,4 +1,4 @@
-/* SortedList.c generated by valac 0.34.2, the Vala compiler
+/* SortedList.c generated by valac 0.32.1, the Vala compiler
  * generated from SortedList.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -130,13 +130,13 @@ gint64 file_comparator (void* a, void* b) {
 #line 12 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = a;
 #line 12 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp1_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp0_, g_file_get_type (), GFile));
+	_tmp1_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp0_, G_TYPE_FILE, GFile));
 #line 12 "/home/jens/Source/shotwell/src/SortedList.vala"
 	path_a = _tmp1_;
 #line 13 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = b;
 #line 13 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp3_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp2_, g_file_get_type (), GFile));
+	_tmp3_ = g_file_get_path (G_TYPE_CHECK_INSTANCE_CAST ((GFile*) _tmp2_, G_TYPE_FILE, GFile));
 #line 13 "/home/jens/Source/shotwell/src/SortedList.vala"
 	path_b = _tmp3_;
 #line 16 "/home/jens/Source/shotwell/src/SortedList.vala"
diff --git a/src/Tag.c b/src/Tag.c
index 4813ce0..db41ec9 100644
--- a/src/Tag.c
+++ b/src/Tag.c
@@ -1,4 +1,4 @@
-/* Tag.c generated by valac 0.34.2, the Vala compiler
+/* Tag.c generated by valac 0.32.1, the Vala compiler
  * generated from Tag.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3240,7 +3240,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 393 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3243 "Tag.c"
-				goto __catch469_database_error;
+				goto __catch467_database_error;
 			}
 #line 393 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (rows);
@@ -3264,8 +3264,8 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 		_g_object_unref0 (_tmp1_);
 #line 3266 "Tag.c"
 	}
-	goto __finally469;
-	__catch469_database_error:
+	goto __finally467;
+	__catch467_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -3281,7 +3281,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 		_g_error_free0 (err);
 #line 3283 "Tag.c"
 	}
-	__finally469:
+	__finally467:
 #line 392 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 392 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3423,7 +3423,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 418 "/home/jens/Source/shotwell/src/Tag.vala"
 							if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3426 "Tag.c"
-								goto __catch470_database_error;
+								goto __catch468_database_error;
 							}
 #line 418 "/home/jens/Source/shotwell/src/Tag.vala"
 							_g_free0 (name);
@@ -3444,8 +3444,8 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 3445 "Tag.c"
 						}
 					}
-					goto __finally470;
-					__catch470_database_error:
+					goto __finally468;
+					__catch468_database_error:
 					{
 						GError* err = NULL;
 						TagRow* _tmp30_ = NULL;
@@ -3470,7 +3470,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 						_g_error_free0 (err);
 #line 3472 "Tag.c"
 					}
-					__finally470:
+					__finally468:
 #line 417 "/home/jens/Source/shotwell/src/Tag.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 417 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4577,7 +4577,7 @@ Tag* tag_for_path (const gchar* name) {
 #line 563 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 4580 "Tag.c"
-				goto __catch471_database_error;
+				goto __catch469_database_error;
 			}
 #line 563 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (tag);
@@ -4599,8 +4599,8 @@ Tag* tag_for_path (const gchar* name) {
 		_tag_row_unref0 (_tmp8_);
 #line 4601 "Tag.c"
 	}
-	goto __finally471;
-	__catch471_database_error:
+	goto __finally469;
+	__catch469_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
@@ -4616,7 +4616,7 @@ Tag* tag_for_path (const gchar* name) {
 		_g_error_free0 (err);
 #line 4618 "Tag.c"
 	}
-	__finally471:
+	__finally469:
 #line 562 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 562 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5532,7 +5532,7 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 #line 678 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5535 "Tag.c"
-				goto __catch472_database_error;
+				goto __catch470_database_error;
 			}
 #line 678 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_free0 (prepped_name);
@@ -5545,8 +5545,8 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 #line 5546 "Tag.c"
 		}
 	}
-	goto __finally472;
-	__catch472_database_error:
+	goto __finally470;
+	__catch470_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -5566,7 +5566,7 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 		return;
 #line 5568 "Tag.c"
 	}
-	__finally472:
+	__finally470:
 #line 677 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 677 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5678,7 +5678,7 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 #line 700 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5681 "Tag.c"
-				goto __catch473_database_error;
+				goto __catch471_database_error;
 			}
 #line 700 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_free0 (prepped_path);
@@ -5691,8 +5691,8 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 #line 5692 "Tag.c"
 		}
 	}
-	goto __finally473;
-	__catch473_database_error:
+	goto __finally471;
+	__catch471_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_ = NULL;
@@ -5712,7 +5712,7 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 		return;
 #line 5714 "Tag.c"
 	}
-	__finally473:
+	__finally471:
 #line 699 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 699 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7069,7 +7069,7 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 #line 900 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7072 "Tag.c"
-				goto __catch474_database_error;
+				goto __catch472_database_error;
 			}
 #line 900 "/home/jens/Source/shotwell/src/Tag.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7085,8 +7085,8 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 		_tmp6_->tag_id = _tmp0_;
 #line 7087 "Tag.c"
 	}
-	goto __finally474;
-	__catch474_database_error:
+	goto __finally472;
+	__catch472_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -7102,7 +7102,7 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 		_g_error_free0 (err);
 #line 7104 "Tag.c"
 	}
-	__finally474:
+	__finally472:
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8022,35 +8022,35 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 8042 "Tag.c"
 		gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 8050 "Tag.c"
 	} else {
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = -1;
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 8056 "Tag.c"
 	}
@@ -8064,37 +8064,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 8080 "Tag.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 8088 "Tag.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 8100 "Tag.c"
 	}
@@ -8114,112 +8114,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 8124 "Tag.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 8130 "Tag.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 8134 "Tag.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 8138 "Tag.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 8150 "Tag.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 8160 "Tag.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 8166 "Tag.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 8180 "Tag.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 8190 "Tag.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 8196 "Tag.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 8205 "Tag.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 8225 "Tag.c"
 }
@@ -9016,7 +9016,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 #line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 9019 "Tag.c"
-				goto __catch475_database_error;
+				goto __catch473_database_error;
 			}
 #line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (removed_sources);
@@ -9031,8 +9031,8 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 #line 9032 "Tag.c"
 		}
 	}
-	goto __finally475;
-	__catch475_database_error:
+	goto __finally473;
+	__catch473_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp57_ = NULL;
@@ -9048,7 +9048,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 		_g_error_free0 (err);
 #line 9050 "Tag.c"
 	}
-	__finally475:
+	__finally473:
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9260,7 +9260,7 @@ static void tag_real_destroy (DataSource* base) {
 #line 1194 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 9263 "Tag.c"
-				goto __catch476_database_error;
+				goto __catch474_database_error;
 			}
 #line 1194 "/home/jens/Source/shotwell/src/Tag.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9271,8 +9271,8 @@ static void tag_real_destroy (DataSource* base) {
 #line 9272 "Tag.c"
 		}
 	}
-	goto __finally476;
-	__catch476_database_error:
+	goto __finally474;
+	__catch474_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_ = NULL;
@@ -9288,7 +9288,7 @@ static void tag_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 9290 "Tag.c"
 	}
-	__finally476:
+	__finally474:
 #line 1193 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1193 "/home/jens/Source/shotwell/src/Tag.vala"
diff --git a/src/Thumbnail.c b/src/Thumbnail.c
index 78b8d4b..062529f 100644
--- a/src/Thumbnail.c
+++ b/src/Thumbnail.c
@@ -1,4 +1,4 @@
-/* Thumbnail.c generated by valac 0.34.2, the Vala compiler
+/* Thumbnail.c generated by valac 0.32.1, the Vala compiler
  * generated from Thumbnail.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/ThumbnailCache.c b/src/ThumbnailCache.c
index 70c3eca..9e928e3 100644
--- a/src/ThumbnailCache.c
+++ b/src/ThumbnailCache.c
@@ -1,4 +1,4 @@
-/* ThumbnailCache.c generated by valac 0.34.2, the Vala compiler
+/* ThumbnailCache.c generated by valac 0.32.1, 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_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, 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"
diff --git a/src/TimedQueue.c b/src/TimedQueue.c
index 919234a..9d872a5 100644
--- a/src/TimedQueue.c
+++ b/src/TimedQueue.c
@@ -1,4 +1,4 @@
-/* TimedQueue.c generated by valac 0.34.2, the Vala compiler
+/* TimedQueue.c generated by valac 0.32.1, the Vala compiler
  * generated from TimedQueue.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Tombstone.c b/src/Tombstone.c
index e9904b5..cad1972 100644
--- a/src/Tombstone.c
+++ b/src/Tombstone.c
@@ -1,4 +1,4 @@
-/* Tombstone.c generated by valac 0.34.2, the Vala compiler
+/* Tombstone.c generated by valac 0.32.1, the Vala compiler
  * generated from Tombstone.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1320,7 +1320,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 1323 "Tombstone.c"
-				goto __catch545_database_error;
+				goto __catch543_database_error;
 			}
 #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_object_unref0 (marker);
@@ -1333,8 +1333,8 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 #line 1334 "Tombstone.c"
 		}
 	}
-	goto __finally545;
-	__catch545_database_error:
+	goto __finally543;
+	__catch543_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
@@ -1350,7 +1350,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 		_g_error_free0 (err);
 #line 1352 "Tombstone.c"
 	}
-	__finally545:
+	__finally543:
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1636,7 +1636,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 1639 "Tombstone.c"
-						goto __catch546_g_error;
+						goto __catch544_g_error;
 					}
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_tmp22_ = NULL;
@@ -1652,8 +1652,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 					_g_object_unref0 (_data_->_tmp18_);
 #line 1654 "Tombstone.c"
 				}
-				goto __finally546;
-				__catch546_g_error:
+				goto __finally544;
+				__catch544_g_error:
 				{
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->err = _data_->_inner_error_;
@@ -1716,7 +1716,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 					_g_error_free0 (_data_->err);
 #line 1717 "Tombstone.c"
 				}
-				__finally546:
+				__finally544:
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1818,7 +1818,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				if (_data_->_inner_error_->domain == DATABASE_ERROR) {
 #line 1820 "Tombstone.c"
-					goto __catch547_database_error;
+					goto __catch545_database_error;
 				}
 #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_g_object_unref0 (_data_->marker);
@@ -1831,8 +1831,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 1831 "Tombstone.c"
 			}
 		}
-		goto __finally547;
-		__catch547_database_error:
+		goto __finally545;
+		__catch545_database_error:
 		{
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->err2 = _data_->_inner_error_;
@@ -1848,7 +1848,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 			_g_error_free0 (_data_->err2);
 #line 1849 "Tombstone.c"
 		}
-		__finally547:
+		__finally545:
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -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_TYPE_FILE, (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);
 #line 8 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	self->priv->file_map = _tmp0_;
 #line 1910 "Tombstone.c"
@@ -2374,7 +2374,7 @@ void tombstone_init (void) {
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 2376 "Tombstone.c"
-				goto __catch548_database_error;
+				goto __catch546_database_error;
 			}
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL);
@@ -2406,8 +2406,8 @@ void tombstone_init (void) {
 		_tmp1_ = (_vala_array_free (_tmp1_, _tmp1__length1, (GDestroyNotify) tombstone_row_unref), NULL);
 #line 2407 "Tombstone.c"
 	}
-	goto __finally548;
-	__catch548_database_error:
+	goto __finally546;
+	__catch546_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp8_ = NULL;
@@ -2423,7 +2423,7 @@ void tombstone_init (void) {
 		_g_error_free0 (err);
 #line 2424 "Tombstone.c"
 	}
-	__finally548:
+	__finally546:
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3210,7 +3210,7 @@ void tombstone_move (Tombstone* self, GFile* file) {
 #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3212 "Tombstone.c"
-				goto __catch549_database_error;
+				goto __catch547_database_error;
 			}
 #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3221,8 +3221,8 @@ void tombstone_move (Tombstone* self, GFile* file) {
 #line 3221 "Tombstone.c"
 		}
 	}
-	goto __finally549;
-	__catch549_database_error:
+	goto __finally547;
+	__catch547_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -3238,7 +3238,7 @@ void tombstone_move (Tombstone* self, GFile* file) {
 		_g_error_free0 (err);
 #line 3239 "Tombstone.c"
 	}
-	__finally549:
+	__finally547:
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3457,7 +3457,7 @@ static void tombstone_real_destroy (DataSource* base) {
 #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3459 "Tombstone.c"
-				goto __catch550_database_error;
+				goto __catch548_database_error;
 			}
 #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3468,8 +3468,8 @@ static void tombstone_real_destroy (DataSource* base) {
 #line 3468 "Tombstone.c"
 		}
 	}
-	goto __finally550;
-	__catch550_database_error:
+	goto __finally548;
+	__catch548_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -3485,7 +3485,7 @@ static void tombstone_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 3486 "Tombstone.c"
 	}
-	__finally550:
+	__finally548:
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
diff --git a/src/UnityProgressBar.c b/src/UnityProgressBar.c
index e603ec5..c32a00a 100644
--- a/src/UnityProgressBar.c
+++ b/src/UnityProgressBar.c
@@ -1,4 +1,4 @@
-/* UnityProgressBar.c generated by valac 0.34.2, the Vala compiler
+/* UnityProgressBar.c generated by valac 0.32.1, 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 ed5a4de..4be4e79 100644
--- a/src/Upgrades.c
+++ b/src/Upgrades.c
@@ -1,4 +1,4 @@
-/* Upgrades.c generated by valac 0.34.2, the Vala compiler
+/* Upgrades.c generated by valac 0.32.1, the Vala compiler
  * generated from Upgrades.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1123,14 +1123,14 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1126 "Upgrades.c"
-			goto __catch591_g_error;
+			goto __catch589_g_error;
 		}
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		self->priv->num_mimics = _tmp0_;
 #line 1131 "Upgrades.c"
 	}
-	goto __finally591;
-	__catch591_g_error:
+	goto __finally589;
+	__catch589_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
@@ -1149,7 +1149,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 		_g_error_free0 (e);
 #line 1151 "Upgrades.c"
 	}
-	__finally591:
+	__finally589:
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1195,7 +1195,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1198 "Upgrades.c"
-			goto __catch592_g_error;
+			goto __catch590_g_error;
 		}
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp3_ = self->priv->mimic_dir;
@@ -1204,11 +1204,11 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1207 "Upgrades.c"
-			goto __catch592_g_error;
+			goto __catch590_g_error;
 		}
 	}
-	goto __finally592;
-	__catch592_g_error:
+	goto __finally590;
+	__catch590_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp4_ = NULL;
@@ -1227,7 +1227,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		_g_error_free0 (e);
 #line 1229 "Upgrades.c"
 	}
-	__finally592:
+	__finally590:
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
diff --git a/src/VideoMetadata.c b/src/VideoMetadata.c
index b3620b3..f1d6f07 100644
--- a/src/VideoMetadata.c
+++ b/src/VideoMetadata.c
@@ -1,4 +1,4 @@
-/* VideoMetadata.c generated by valac 0.34.2, the Vala compiler
+/* VideoMetadata.c generated by valac 0.32.1, the Vala compiler
  * generated from VideoMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -746,7 +746,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 80 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 749 "VideoMetadata.c"
-			goto __catch573_g_error;
+			goto __catch571_g_error;
 		}
 #line 81 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = test;
@@ -755,7 +755,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 81 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 758 "VideoMetadata.c"
-			goto __catch573_g_error;
+			goto __catch571_g_error;
 		}
 #line 84 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = test;
@@ -809,7 +809,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 95 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 812 "VideoMetadata.c"
-					goto __catch573_g_error;
+					goto __catch571_g_error;
 				}
 #line 96 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp13_ = test;
@@ -818,7 +818,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 96 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 821 "VideoMetadata.c"
-					goto __catch573_g_error;
+					goto __catch571_g_error;
 				}
 #line 97 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp14_ = test;
@@ -833,8 +833,8 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 			}
 		}
 	}
-	goto __finally573;
-	__catch573_g_error:
+	goto __finally571;
+	__catch571_g_error:
 	{
 		GError* e = NULL;
 		GFile* _tmp16_ = NULL;
@@ -865,7 +865,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 		_g_error_free0 (e);
 #line 866 "VideoMetadata.c"
 	}
-	__finally573:
+	__finally571:
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -887,11 +887,11 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 889 "VideoMetadata.c"
-			goto __catch574_g_error;
+			goto __catch572_g_error;
 		}
 	}
-	goto __finally574;
-	__catch574_g_error:
+	goto __finally572;
+	__catch572_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp22_ = NULL;
@@ -910,7 +910,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 		_g_error_free0 (e);
 #line 911 "VideoMetadata.c"
 	}
-	__finally574:
+	__finally572:
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -963,7 +963,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 119 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 965 "VideoMetadata.c"
-			goto __catch575_g_error;
+			goto __catch573_g_error;
 		}
 #line 120 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		done = FALSE;
@@ -994,7 +994,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 123 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 996 "VideoMetadata.c"
-				goto __catch575_g_error;
+				goto __catch573_g_error;
 			}
 #line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp5_ = test;
@@ -1058,7 +1058,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_quick_time_atom_unref0 (child);
 #line 1060 "VideoMetadata.c"
-						goto __catch575_g_error;
+						goto __catch573_g_error;
 					}
 #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp16_ = child;
@@ -1114,7 +1114,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 							_quick_time_atom_unref0 (child);
 #line 1116 "VideoMetadata.c"
-							goto __catch575_g_error;
+							goto __catch573_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_tmp26_ = child;
@@ -1127,7 +1127,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 							_quick_time_atom_unref0 (child);
 #line 1129 "VideoMetadata.c"
-							goto __catch575_g_error;
+							goto __catch573_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						timestamp = _tmp25_ - QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT;
@@ -1146,7 +1146,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_quick_time_atom_unref0 (child);
 #line 1148 "VideoMetadata.c"
-						goto __catch575_g_error;
+						goto __catch573_g_error;
 					}
 				}
 #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1160,12 +1160,12 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 146 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1162 "VideoMetadata.c"
-				goto __catch575_g_error;
+				goto __catch573_g_error;
 			}
 		}
 	}
-	goto __finally575;
-	__catch575_g_error:
+	goto __finally573;
+	__catch573_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp30_ = NULL;
@@ -1184,7 +1184,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		_g_error_free0 (e);
 #line 1185 "VideoMetadata.c"
 	}
-	__finally575:
+	__finally573:
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1206,11 +1206,11 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1208 "VideoMetadata.c"
-			goto __catch576_g_error;
+			goto __catch574_g_error;
 		}
 	}
-	goto __finally576;
-	__catch576_g_error:
+	goto __finally574;
+	__catch574_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp33_ = NULL;
@@ -1229,7 +1229,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		_g_error_free0 (e);
 #line 1230 "VideoMetadata.c"
 	}
-	__finally576:
+	__finally574:
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1631,7 +1631,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) {
 #line 1631 "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));
+	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
 #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_g_object_unref0 (self->priv->input);
 #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1670,7 +1670,7 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) {
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp1_ = self->priv->input;
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1836,15 +1836,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 1849 "VideoMetadata.c"
 }
@@ -2142,7 +2142,7 @@ static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GErr
 #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp1_ = skip_amount;
 #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream), _tmp1_, &_inner_error_);
+	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream), _tmp1_, &_inner_error_);
 #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2602,7 +2602,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 323 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2604 "VideoMetadata.c"
-			goto __catch577_g_error;
+			goto __catch575_g_error;
 		}
 #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = chunk;
@@ -2611,7 +2611,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2613 "VideoMetadata.c"
-			goto __catch577_g_error;
+			goto __catch575_g_error;
 		}
 #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp5_ = chunk;
@@ -2640,7 +2640,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2642 "VideoMetadata.c"
-				goto __catch577_g_error;
+				goto __catch575_g_error;
 			}
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp12_ = _tmp9_;
@@ -2667,8 +2667,8 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 2667 "VideoMetadata.c"
 		}
 	}
-	goto __finally577;
-	__catch577_g_error:
+	goto __finally575;
+	__catch575_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp14_ = NULL;
@@ -2687,7 +2687,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		_g_error_free0 (e);
 #line 2688 "VideoMetadata.c"
 	}
-	__finally577:
+	__finally575:
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2709,11 +2709,11 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2711 "VideoMetadata.c"
-			goto __catch578_g_error;
+			goto __catch576_g_error;
 		}
 	}
-	goto __finally578;
-	__catch578_g_error:
+	goto __finally576;
+	__catch576_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp17_ = NULL;
@@ -2732,7 +2732,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		_g_error_free0 (e);
 #line 2733 "VideoMetadata.c"
 	}
-	__finally578:
+	__finally576:
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2951,37 +2951,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 2966 "VideoMetadata.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 2974 "VideoMetadata.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 2986 "VideoMetadata.c"
 	}
@@ -3001,112 +3001,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 3010 "VideoMetadata.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 3016 "VideoMetadata.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 3020 "VideoMetadata.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 3024 "VideoMetadata.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 3036 "VideoMetadata.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 3046 "VideoMetadata.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 3052 "VideoMetadata.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 3066 "VideoMetadata.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 3076 "VideoMetadata.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 3082 "VideoMetadata.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 3091 "VideoMetadata.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 3111 "VideoMetadata.c"
 }
@@ -4023,19 +4023,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 4040 "VideoMetadata.c"
 }
@@ -4073,7 +4073,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 515 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4075 "VideoMetadata.c"
-			goto __catch579_g_error;
+			goto __catch577_g_error;
 		}
 #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = chunk;
@@ -4082,7 +4082,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4084 "VideoMetadata.c"
-			goto __catch579_g_error;
+			goto __catch577_g_error;
 		}
 #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = chunk;
@@ -4093,7 +4093,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4095 "VideoMetadata.c"
-			goto __catch579_g_error;
+			goto __catch577_g_error;
 		}
 #line 518 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp6_ = sdate;
@@ -4122,8 +4122,8 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_free0 (sdate);
 #line 4123 "VideoMetadata.c"
 	}
-	goto __finally579;
-	__catch579_g_error:
+	goto __finally577;
+	__catch577_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp11_ = NULL;
@@ -4142,7 +4142,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_error_free0 (e);
 #line 4143 "VideoMetadata.c"
 	}
-	__finally579:
+	__finally577:
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4164,11 +4164,11 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4166 "VideoMetadata.c"
-			goto __catch580_g_error;
+			goto __catch578_g_error;
 		}
 	}
-	goto __finally580;
-	__catch580_g_error:
+	goto __finally578;
+	__catch578_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp14_ = NULL;
@@ -4187,7 +4187,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_error_free0 (e);
 #line 4188 "VideoMetadata.c"
 	}
-	__finally580:
+	__finally578:
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4575,7 +4575,7 @@ void avi_chunk_open_file (AVIChunk* self, GError** error) {
 #line 4575 "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));
+	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
 #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_g_object_unref0 (self->priv->input);
 #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4614,7 +4614,7 @@ void avi_chunk_close_file (AVIChunk* self, GError** error) {
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp1_ = self->priv->input;
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4643,7 +4643,7 @@ void avi_chunk_nonsection_skip (AVIChunk* self, guint64 skip_amount, GError** er
 #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp1_ = skip_amount;
 #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream), _tmp1_, &_inner_error_);
+	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream), _tmp1_, &_inner_error_);
 #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4671,7 +4671,7 @@ void avi_chunk_skip (AVIChunk* self, guint64 skip_amount, GError** error) {
 #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp2_ = skip_amount;
 #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_input_stream_get_type (), GInputStream), _tmp2_, &_inner_error_);
+	skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_INPUT_STREAM, GInputStream), _tmp2_, &_inner_error_);
 #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
diff --git a/src/VideoMonitor.c b/src/VideoMonitor.c
index 19a7eeb..b3e9adb 100644
--- a/src/VideoMonitor.c
+++ b/src/VideoMonitor.c
@@ -1,4 +1,4 @@
-/* VideoMonitor.c generated by valac 0.34.2, the Vala compiler
+/* VideoMonitor.c generated by valac 0.32.1, the Vala compiler
  * generated from VideoMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/VideoSupport.c b/src/VideoSupport.c
index f781734..23ea672 100644
--- a/src/VideoSupport.c
+++ b/src/VideoSupport.c
@@ -1,4 +1,4 @@
-/* VideoSupport.c generated by valac 0.34.2, the Vala compiler
+/* VideoSupport.c generated by valac 0.32.1, the Vala compiler
  * generated from VideoSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1920,103 +1920,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 1936 "VideoSupport.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 1945 "VideoSupport.c"
 	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 1951 "VideoSupport.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 1960 "VideoSupport.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 1966 "VideoSupport.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 1975 "VideoSupport.c"
 	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 1979 "VideoSupport.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 1987 "VideoSupport.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 1996 "VideoSupport.c"
 	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 2000 "VideoSupport.c"
 	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 2022 "VideoSupport.c"
 }
@@ -2321,7 +2321,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 #line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2324 "VideoSupport.c"
-			goto __catch492_g_error;
+			goto __catch490_g_error;
 		}
 #line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp3_;
@@ -2335,8 +2335,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (_tmp3_);
 #line 2337 "VideoSupport.c"
 	}
-	goto __finally492;
-	__catch492_g_error:
+	goto __finally490;
+	__catch490_g_error:
 	{
 		GError* err = NULL;
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2355,7 +2355,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		return result;
 #line 2357 "VideoSupport.c"
 	}
-	__finally492:
+	__finally490:
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2474,7 +2474,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
 #line 2477 "VideoSupport.c"
-				goto __catch493_video_error;
+				goto __catch491_video_error;
 			}
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
@@ -2500,8 +2500,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		clip_duration = _tmp26_;
 #line 2502 "VideoSupport.c"
 	}
-	goto __finally493;
-	__catch493_video_error:
+	goto __finally491;
+	__catch491_video_error:
 	{
 		GError* err = NULL;
 		GError* _tmp29_ = NULL;
@@ -2554,7 +2554,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_error_free0 (err);
 #line 2555 "VideoSupport.c"
 	}
-	__finally493:
+	__finally491:
 #line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2603,7 +2603,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 #line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2605 "VideoSupport.c"
-			goto __catch494_g_error;
+			goto __catch492_g_error;
 		}
 #line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp33_ = metadata;
@@ -2699,8 +2699,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_media_metadata_unref0 (metadata);
 #line 2700 "VideoSupport.c"
 	}
-	goto __finally494;
-	__catch494_g_error:
+	goto __finally492;
+	__catch492_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp51_ = NULL;
@@ -2719,7 +2719,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_error_free0 (err);
 #line 2720 "VideoSupport.c"
 	}
-	__finally494:
+	__finally492:
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3092,7 +3092,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 #line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3094 "VideoSupport.c"
-			goto __catch495_g_error;
+			goto __catch493_g_error;
 		}
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = d;
@@ -3115,7 +3115,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (d);
 #line 3117 "VideoSupport.c"
-			goto __catch495_g_error;
+			goto __catch493_g_error;
 		}
 #line 193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = info;
@@ -3208,8 +3208,8 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_g_object_unref0 (d);
 #line 3209 "VideoSupport.c"
 	}
-	goto __finally495;
-	__catch495_g_error:
+	goto __finally493;
+	__catch493_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp35_ = NULL;
@@ -3249,9 +3249,9 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
 #line 3251 "VideoSupport.c"
-		goto __finally495;
+		goto __finally493;
 	}
-	__finally495:
+	__finally493:
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3408,7 +3408,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 #line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3410 "VideoSupport.c"
-			goto __catch496_g_error;
+			goto __catch494_g_error;
 		}
 #line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = self->priv->thumbnailer_pid;
@@ -3416,8 +3416,8 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		g_debug ("VideoSupport.vala:234: Spawned thumbnailer, child pid: %d", (gint) _tmp14_);
 #line 3417 "VideoSupport.c"
 	}
-	goto __finally496;
-	__catch496_g_error:
+	goto __finally494;
+	__catch494_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp15_ = NULL;
@@ -3455,7 +3455,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		return result;
 #line 3456 "VideoSupport.c"
 	}
-	__finally496:
+	__finally494:
 #line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3490,7 +3490,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp22_ = unix_input;
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		_tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp21_ = _tmp23_;
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3498,7 +3498,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (unix_input);
 #line 3500 "VideoSupport.c"
-			goto __catch497_g_error;
+			goto __catch495_g_error;
 		}
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = _tmp21_;
@@ -3514,8 +3514,8 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_object_unref0 (unix_input);
 #line 3515 "VideoSupport.c"
 	}
-	goto __finally497;
-	__catch497_g_error:
+	goto __finally495;
+	__catch495_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp25_ = NULL;
@@ -3538,7 +3538,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_error_free0 (e);
 #line 3539 "VideoSupport.c"
 	}
-	__finally497:
+	__finally495:
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4947,7 +4947,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 #line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4946 "VideoSupport.c"
-				goto __catch498_g_error;
+				goto __catch496_g_error;
 			}
 #line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp34_ = app_window_get_instance ();
@@ -4959,8 +4959,8 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			_g_object_unref0 (_tmp35_);
 #line 4957 "VideoSupport.c"
 		}
-		goto __finally498;
-		__catch498_g_error:
+		goto __finally496;
+		__catch496_g_error:
 		{
 			GError* err = NULL;
 			AppWindow* _tmp36_ = NULL;
@@ -4986,7 +4986,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			_g_error_free0 (err);
 #line 4984 "VideoSupport.c"
 		}
-		__finally498:
+		__finally496:
 #line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5097,7 +5097,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 #line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5096 "VideoSupport.c"
-				goto __catch499_database_error;
+				goto __catch497_database_error;
 			}
 #line 520 "/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);
@@ -5130,7 +5130,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 				_tmp5_->backlinks = _tmp7_;
 #line 5128 "VideoSupport.c"
 			}
-			__finally500:
+			__finally498:
 			{
 				VideoRow* _tmp8_ = NULL;
 #line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5144,7 +5144,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 #line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5143 "VideoSupport.c"
-					goto __catch499_database_error;
+					goto __catch497_database_error;
 				}
 #line 521 "/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);
@@ -5156,8 +5156,8 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 			}
 		}
 	}
-	goto __finally499;
-	__catch499_database_error:
+	goto __finally497;
+	__catch497_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
@@ -5184,7 +5184,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		_g_error_free0 (err);
 #line 5182 "VideoSupport.c"
 	}
-	__finally499:
+	__finally497:
 #line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5272,7 +5272,7 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 			return result;
 #line 5270 "VideoSupport.c"
 		}
-		__finally501:
+		__finally499:
 		{
 			VideoRow* _tmp12_ = NULL;
 #line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5387,7 +5387,7 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 #line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5386 "VideoSupport.c"
-				goto __catch502_database_error;
+				goto __catch500_database_error;
 			}
 #line 554 "/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);
@@ -5418,8 +5418,8 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 #line 5415 "VideoSupport.c"
 		}
 	}
-	goto __finally502;
-	__catch502_database_error:
+	goto __finally500;
+	__catch500_database_error:
 	{
 		GError* err = NULL;
 #line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5444,7 +5444,7 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 		return result;
 #line 5442 "VideoSupport.c"
 	}
-	__finally502:
+	__finally500:
 #line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5510,7 +5510,7 @@ void video_import_failed (Video* video) {
 #line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5509 "VideoSupport.c"
-				goto __catch503_database_error;
+				goto __catch501_database_error;
 			}
 #line 568 "/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);
@@ -5521,8 +5521,8 @@ void video_import_failed (Video* video) {
 #line 5518 "VideoSupport.c"
 		}
 	}
-	goto __finally503;
-	__catch503_database_error:
+	goto __finally501;
+	__catch501_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -5538,7 +5538,7 @@ void video_import_failed (Video* video) {
 		_g_error_free0 (err);
 #line 5536 "VideoSupport.c"
 	}
-	__finally503:
+	__finally501:
 #line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5617,7 +5617,7 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			_tmp11_ = backing[0];
 #line 5615 "VideoSupport.c"
 		}
-		__finally504:
+		__finally502:
 		{
 			VideoRow* _tmp12_ = NULL;
 #line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5734,7 +5734,7 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 			return result;
 #line 5732 "VideoSupport.c"
 		}
-		__finally505:
+		__finally503:
 		{
 			VideoRow* _tmp5_ = NULL;
 #line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5938,7 +5938,7 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 			return;
 #line 5936 "VideoSupport.c"
 		}
-		__finally506:
+		__finally504:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6013,7 +6013,7 @@ static gchar* video_real_get_title (MediaSource* base) {
 			return result;
 #line 6011 "VideoSupport.c"
 		}
-		__finally507:
+		__finally505:
 		{
 			VideoRow* _tmp5_ = NULL;
 #line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6112,7 +6112,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 #line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6111 "VideoSupport.c"
-						goto __catch509_database_error;
+						goto __catch507_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
@@ -6133,8 +6133,8 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 #line 6130 "VideoSupport.c"
 				}
 			}
-			goto __finally509;
-			__catch509_database_error:
+			goto __finally507;
+			__catch507_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
@@ -6163,7 +6163,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 				return;
 #line 6161 "VideoSupport.c"
 			}
-			__finally509:
+			__finally507:
 #line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6166 "VideoSupport.c"
@@ -6197,7 +6197,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 			_tmp16_->title = _tmp18_;
 #line 6195 "VideoSupport.c"
 		}
-		__finally508:
+		__finally506:
 		{
 			VideoRow* _tmp19_ = NULL;
 #line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6272,7 +6272,7 @@ static gchar* video_real_get_comment (MediaSource* base) {
 			return result;
 #line 6270 "VideoSupport.c"
 		}
-		__finally510:
+		__finally508:
 		{
 			VideoRow* _tmp5_ = NULL;
 #line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6374,7 +6374,7 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 #line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6373 "VideoSupport.c"
-						goto __catch512_database_error;
+						goto __catch510_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
@@ -6395,8 +6395,8 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 #line 6392 "VideoSupport.c"
 				}
 			}
-			goto __finally512;
-			__catch512_database_error:
+			goto __finally510;
+			__catch510_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
@@ -6427,7 +6427,7 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 				return result;
 #line 6425 "VideoSupport.c"
 			}
-			__finally512:
+			__finally510:
 #line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6430 "VideoSupport.c"
@@ -6461,7 +6461,7 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 			_tmp16_->comment = _tmp18_;
 #line 6459 "VideoSupport.c"
 		}
-		__finally511:
+		__finally509:
 		{
 			VideoRow* _tmp19_ = NULL;
 #line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6537,7 +6537,7 @@ static Rating video_real_get_rating (MediaSource* base) {
 			return result;
 #line 6535 "VideoSupport.c"
 		}
-		__finally513:
+		__finally511:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6638,7 +6638,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 #line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6637 "VideoSupport.c"
-						goto __catch515_database_error;
+						goto __catch513_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
@@ -6657,8 +6657,8 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 #line 6654 "VideoSupport.c"
 				}
 			}
-			goto __finally515;
-			__catch515_database_error:
+			goto __finally513;
+			__catch513_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
@@ -6685,7 +6685,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 				return;
 #line 6683 "VideoSupport.c"
 			}
-			__finally515:
+			__finally513:
 #line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6688 "VideoSupport.c"
@@ -6713,7 +6713,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 			_tmp16_->rating = _tmp17_;
 #line 6711 "VideoSupport.c"
 		}
-		__finally514:
+		__finally512:
 		{
 			VideoRow* _tmp18_ = NULL;
 #line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6772,7 +6772,7 @@ static void video_real_increase_rating (MediaSource* base) {
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
 #line 6770 "VideoSupport.c"
 		}
-		__finally516:
+		__finally514:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6822,7 +6822,7 @@ static void video_real_decrease_rating (MediaSource* base) {
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
 #line 6820 "VideoSupport.c"
 		}
-		__finally517:
+		__finally515:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7036,7 +7036,7 @@ static void video_real_get_event_id (MediaSource* base, EventID* result) {
 			return;
 #line 7034 "VideoSupport.c"
 		}
-		__finally518:
+		__finally516:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7115,7 +7115,7 @@ static gchar* video_real_to_string (DataObject* base) {
 			return result;
 #line 7113 "VideoSupport.c"
 		}
-		__finally519:
+		__finally517:
 		{
 			VideoRow* _tmp11_ = NULL;
 #line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7169,7 +7169,7 @@ void video_get_video_id (Video* self, VideoID* result) {
 			return;
 #line 7167 "VideoSupport.c"
 		}
-		__finally520:
+		__finally518:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7225,7 +7225,7 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 			return result;
 #line 7223 "VideoSupport.c"
 		}
-		__finally521:
+		__finally519:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7286,11 +7286,11 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 #line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7285 "VideoSupport.c"
-					goto __catch523_g_error;
+					goto __catch521_g_error;
 				}
 			}
-			goto __finally523;
-			__catch523_g_error:
+			goto __finally521;
+			__catch521_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp6_ = NULL;
@@ -7309,7 +7309,7 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 				_g_error_free0 (e);
 #line 7307 "VideoSupport.c"
 			}
-			__finally523:
+			__finally521:
 #line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7312 "VideoSupport.c"
@@ -7337,7 +7337,7 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 			_tmp9_->exposure_time = _tmp10_;
 #line 7335 "VideoSupport.c"
 		}
-		__finally522:
+		__finally520:
 		{
 			VideoRow* _tmp11_ = NULL;
 #line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7412,7 +7412,7 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 			return;
 #line 7410 "VideoSupport.c"
 		}
-		__finally524:
+		__finally522:
 		{
 			VideoRow* _tmp7_ = NULL;
 #line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7499,7 +7499,7 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 			return result;
 #line 7497 "VideoSupport.c"
 		}
-		__finally525:
+		__finally523:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7555,7 +7555,7 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 			return result;
 #line 7553 "VideoSupport.c"
 		}
-		__finally526:
+		__finally524:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7658,7 +7658,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 #line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7657 "VideoSupport.c"
-					goto __finally528;
+					goto __finally526;
 				}
 #line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = self->priv->backing_row;
@@ -7670,7 +7670,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				_tmp14_->timestamp = (time_t) _tmp16_;
 #line 7668 "VideoSupport.c"
 			}
-			__finally528:
+			__finally526:
 			{
 				VideoRow* _tmp17_ = NULL;
 #line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7684,7 +7684,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 #line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7683 "VideoSupport.c"
-					goto __catch527_database_error;
+					goto __catch525_database_error;
 				}
 #line 825 "/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);
@@ -7696,8 +7696,8 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 			}
 		}
 	}
-	goto __finally527;
-	__catch527_database_error:
+	goto __finally525;
+	__catch525_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
@@ -7715,7 +7715,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 		return;
 #line 7713 "VideoSupport.c"
 	}
-	__finally527:
+	__finally525:
 #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7776,7 +7776,7 @@ gchar* video_get_filename (Video* self) {
 			return result;
 #line 7774 "VideoSupport.c"
 		}
-		__finally529:
+		__finally527:
 		{
 			VideoRow* _tmp5_ = NULL;
 #line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7918,7 +7918,7 @@ gdouble video_get_clip_duration (Video* self) {
 			return result;
 #line 7916 "VideoSupport.c"
 		}
-		__finally530:
+		__finally528:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7973,7 +7973,7 @@ gboolean video_get_is_interpretable (Video* self) {
 			return result;
 #line 7971 "VideoSupport.c"
 		}
-		__finally531:
+		__finally529:
 		{
 			VideoRow* _tmp4_ = NULL;
 #line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8040,7 +8040,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 			_tmp5_->is_interpretable = _tmp6_;
 #line 8038 "VideoSupport.c"
 		}
-		__finally532:
+		__finally530:
 		{
 			VideoRow* _tmp7_ = NULL;
 #line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8082,7 +8082,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 #line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 8081 "VideoSupport.c"
-				goto __catch533_database_error;
+				goto __catch531_database_error;
 			}
 #line 882 "/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);
@@ -8093,8 +8093,8 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 #line 8090 "VideoSupport.c"
 		}
 	}
-	goto __finally533;
-	__catch533_database_error:
+	goto __finally531;
+	__catch531_database_error:
 	{
 		GError* e = NULL;
 		GError* _tmp12_ = NULL;
@@ -8110,7 +8110,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 		_g_error_free0 (e);
 #line 8108 "VideoSupport.c"
 	}
-	__finally533:
+	__finally531:
 #line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8186,7 +8186,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 #line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
 #line 8185 "VideoSupport.c"
-				goto __catch534_video_error;
+				goto __catch532_video_error;
 			}
 #line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
@@ -8214,8 +8214,8 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		preview_frame = _tmp9_;
 #line 8212 "VideoSupport.c"
 	}
-	goto __finally534;
-	__catch534_video_error:
+	goto __finally532;
+	__catch532_video_error:
 	{
 		GError* e = NULL;
 		VideoInterpretableResults* _tmp10_ = NULL;
@@ -8247,7 +8247,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		return result;
 #line 8245 "VideoSupport.c"
 	}
-	__finally534:
+	__finally532:
 #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8322,7 +8322,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 			_tmp21_->clip_duration = _tmp22_;
 #line 8320 "VideoSupport.c"
 		}
-		__finally535:
+		__finally533:
 		{
 			VideoRow* _tmp23_ = NULL;
 #line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8411,7 +8411,7 @@ static void video_real_destroy (DataSource* base) {
 #line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 8410 "VideoSupport.c"
-				goto __catch536_database_error;
+				goto __catch534_database_error;
 			}
 #line 938 "/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);
@@ -8422,8 +8422,8 @@ static void video_real_destroy (DataSource* base) {
 #line 8419 "VideoSupport.c"
 		}
 	}
-	goto __finally536;
-	__catch536_database_error:
+	goto __finally534;
+	__catch534_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp4_ = NULL;
@@ -8444,7 +8444,7 @@ static void video_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 8442 "VideoSupport.c"
 	}
-	__finally536:
+	__finally534:
 #line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8638,7 +8638,7 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 #line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 8637 "VideoSupport.c"
-						goto __catch538_database_error;
+						goto __catch536_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
@@ -8657,8 +8657,8 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 #line 8654 "VideoSupport.c"
 				}
 			}
-			goto __finally538;
-			__catch538_database_error:
+			goto __finally536;
+			__catch536_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
@@ -8693,7 +8693,7 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 				return result;
 #line 8691 "VideoSupport.c"
 			}
-			__finally538:
+			__finally536:
 #line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8696 "VideoSupport.c"
@@ -8721,7 +8721,7 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 			_tmp21_->flags = _tmp22_;
 #line 8719 "VideoSupport.c"
 		}
-		__finally537:
+		__finally535:
 		{
 			VideoRow* _tmp23_ = NULL;
 #line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8842,7 +8842,7 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 #line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 8841 "VideoSupport.c"
-						goto __catch540_database_error;
+						goto __catch538_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
@@ -8861,8 +8861,8 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 #line 8858 "VideoSupport.c"
 				}
 			}
-			goto __finally540;
-			__catch540_database_error:
+			goto __finally538;
+			__catch538_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
@@ -8897,7 +8897,7 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 				return result;
 #line 8895 "VideoSupport.c"
 			}
-			__finally540:
+			__finally538:
 #line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8900 "VideoSupport.c"
@@ -8925,7 +8925,7 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 			_tmp21_->flags = _tmp22_;
 #line 8923 "VideoSupport.c"
 		}
-		__finally539:
+		__finally537:
 		{
 			VideoRow* _tmp23_ = NULL;
 #line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8998,7 +8998,7 @@ gboolean video_is_flag_set (Video* self, guint64 flag) {
 			return result;
 #line 8996 "VideoSupport.c"
 		}
-		__finally541:
+		__finally539:
 		{
 			VideoRow* _tmp6_ = NULL;
 #line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9120,7 +9120,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 #line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9119 "VideoSupport.c"
-					goto __finally543;
+					goto __finally541;
 				}
 #line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = self->priv->backing_row;
@@ -9134,7 +9134,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				_tmp15_->filepath = _tmp17_;
 #line 9132 "VideoSupport.c"
 			}
-			__finally543:
+			__finally541:
 			{
 				VideoRow* _tmp18_ = NULL;
 #line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9148,7 +9148,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 #line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 9147 "VideoSupport.c"
-					goto __catch542_database_error;
+					goto __catch540_database_error;
 				}
 #line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
@@ -9164,8 +9164,8 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 			}
 		}
 	}
-	goto __finally542;
-	__catch542_database_error:
+	goto __finally540;
+	__catch540_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_ = NULL;
@@ -9187,7 +9187,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 		return;
 #line 9185 "VideoSupport.c"
 	}
-	__finally542:
+	__finally540:
 #line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9357,7 +9357,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9356 "VideoSupport.c"
-				goto __catch544_g_error;
+				goto __catch542_g_error;
 			}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->video;
@@ -9368,7 +9368,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9367 "VideoSupport.c"
-				goto __catch544_g_error;
+				goto __catch542_g_error;
 			}
 #line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->video;
@@ -9376,8 +9376,8 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
 #line 9374 "VideoSupport.c"
 		}
-		goto __finally544;
-		__catch544_g_error:
+		goto __finally542;
+		__catch542_g_error:
 		{
 			GError* err = NULL;
 			Video* _tmp9_ = NULL;
@@ -9407,7 +9407,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			_g_error_free0 (err);
 #line 9405 "VideoSupport.c"
 		}
-		__finally544:
+		__finally542:
 #line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
diff --git a/src/camera/Branch.c b/src/camera/Branch.c
index d8daac0..7f2836e 100644
--- a/src/camera/Branch.c
+++ b/src/camera/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.2, the Vala compiler
+/* Branch.c generated by valac 0.32.1, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/camera/Camera.c b/src/camera/Camera.c
index f2d3f42..71768fa 100644
--- a/src/camera/Camera.c
+++ b/src/camera/Camera.c
@@ -1,4 +1,4 @@
-/* Camera.c generated by valac 0.34.2, the Vala compiler
+/* Camera.c generated by valac 0.32.1, 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 b25e4e0..6a49bcf 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -1,4 +1,4 @@
-/* CameraTable.c generated by valac 0.34.2, the Vala compiler
+/* CameraTable.c generated by valac 0.32.1, the Vala compiler
  * generated from CameraTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1545,37 +1545,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 1559 "CameraTable.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1567 "CameraTable.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1579 "CameraTable.c"
 	}
@@ -1595,112 +1595,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 1603 "CameraTable.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 1609 "CameraTable.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 1613 "CameraTable.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 1617 "CameraTable.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 1629 "CameraTable.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 1639 "CameraTable.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 1645 "CameraTable.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 1659 "CameraTable.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 1669 "CameraTable.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 1675 "CameraTable.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 1684 "CameraTable.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 1704 "CameraTable.c"
 }
@@ -1709,11 +1709,11 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 1717 "CameraTable.c"
 	{
@@ -1728,73 +1728,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1748 "CameraTable.c"
 				goto __catch56_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 1757 "CameraTable.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1773 "CameraTable.c"
 				goto __catch56_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 1784 "CameraTable.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1798 "CameraTable.c"
 	}
@@ -1802,24 +1802,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch56_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 1812 "CameraTable.c"
 	}
 	__finally56:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
 #line 1823 "CameraTable.c"
 	}
diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c
index 7d923bd..a703945 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -1,4 +1,4 @@
-/* GPhoto.c generated by valac 0.34.2, the Vala compiler
+/* GPhoto.c generated by valac 0.32.1, the Vala compiler
  * generated from GPhoto.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1032,103 +1032,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 1048 "GPhoto.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 1057 "GPhoto.c"
 	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 1063 "GPhoto.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 1072 "GPhoto.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 1078 "GPhoto.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 1087 "GPhoto.c"
 	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 1091 "GPhoto.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 1099 "GPhoto.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 1108 "GPhoto.c"
 	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 1112 "GPhoto.c"
 	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 1134 "GPhoto.c"
 }
@@ -1769,7 +1769,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp46_ = mins;
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp47_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
+	_tmp47_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_INPUT_STREAM, GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp45_ = _tmp47_;
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2472,7 +2472,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp31_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp30_, _tmp30__length1, _gp_on_mins_destroyed_gdestroy_notify);
 #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream);
+		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, G_TYPE_INPUT_STREAM, GInputStream);
 #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer = (g_free (buffer), NULL);
 #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2577,7 +2577,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp51_ = NULL;
 #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, G_TYPE_INPUT_STREAM, GInputStream);
 #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (_tmp51_);
 #line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index be81b96..928a456 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -1,4 +1,4 @@
-/* ImportPage.c generated by valac 0.34.2, the Vala compiler
+/* ImportPage.c generated by valac 0.32.1, the Vala compiler
  * generated from ImportPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1883,7 +1883,7 @@ GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
 GAction* page_get_action (Page* self, const gchar* name);
 gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* self);
-static GVariant* _variant_new11 (gboolean value);
+static GVariant* _variant_new15 (gboolean value);
 Camera* import_page_get_camera (ImportPage* self);
 gchar* import_page_get_uri (ImportPage* self);
 gboolean import_page_is_busy (ImportPage* self);
@@ -5621,9 +5621,9 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 #line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
 #line 761 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/ImportContextMenu");
+	checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu");
 #line 762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/ImportContextMenu");
+	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu");
 #line 709 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
 #line 5629 "ImportPage.c"
@@ -6097,7 +6097,7 @@ static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_
 }
 
 
-static GVariant* _variant_new11 (gboolean value) {
+static GVariant* _variant_new15 (gboolean value) {
 #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 6103 "ImportPage.c"
@@ -6109,12 +6109,11 @@ static void import_page_real_add_actions (Page* base) {
 	AppWindow* _tmp0_ = NULL;
 	AppWindow* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
+	GAction* _tmp3_ = NULL;
+	ConfigFacade* _tmp4_ = NULL;
 	ConfigFacade* _tmp5_ = NULL;
-	ConfigFacade* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	GVariant* _tmp8_ = NULL;
+	gboolean _tmp6_ = FALSE;
+	GVariant* _tmp7_ = NULL;
 #line 875 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6130,32 +6129,24 @@ static void import_page_real_add_actions (Page* base) {
 #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle");
 #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp3_ == NULL) {
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_object_unref0 (_tmp2_);
-#line 6138 "ImportPage.c"
-	}
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5_ = config_facade_get_instance ();
+	_tmp4_ = config_facade_get_instance ();
 #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp7_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp6_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp8_ = _variant_new11 (_tmp7_);
+	_tmp7_ = _variant_new15 (_tmp6_);
 #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_simple_action_set_state (_tmp4_, _tmp8_);
+	g_action_change_state (_tmp3_, _tmp7_);
 #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_g_variant_unref0 (_tmp8_);
+	_g_variant_unref0 (_tmp7_);
 #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_g_object_unref0 (_tmp6_);
+	_g_object_unref0 (_tmp5_);
 #line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_g_object_unref0 (_tmp4_);
-#line 6158 "ImportPage.c"
+	_g_object_unref0 (_tmp3_);
+#line 6149 "ImportPage.c"
 }
 
 
@@ -6173,7 +6164,7 @@ Camera* import_page_get_camera (ImportPage* self) {
 	result = _tmp1_;
 #line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6176 "ImportPage.c"
+#line 6167 "ImportPage.c"
 }
 
 
@@ -6191,7 +6182,7 @@ gchar* import_page_get_uri (ImportPage* self) {
 	result = _tmp1_;
 #line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6194 "ImportPage.c"
+#line 6185 "ImportPage.c"
 }
 
 
@@ -6206,7 +6197,7 @@ gboolean import_page_is_busy (ImportPage* self) {
 	result = _tmp0_;
 #line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6209 "ImportPage.c"
+#line 6200 "ImportPage.c"
 }
 
 
@@ -6228,7 +6219,7 @@ static void import_page_real_init_actions (Page* base, gint selected_count, gint
 	_tmp1_ = count;
 #line 901 "/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 6231 "ImportPage.c"
+#line 6222 "ImportPage.c"
 }
 
 
@@ -6242,23 +6233,23 @@ gboolean import_page_is_refreshed (ImportPage* self) {
 	_tmp1_ = self->priv->refreshed;
 #line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 6245 "ImportPage.c"
+#line 6236 "ImportPage.c"
 		gboolean _tmp2_ = FALSE;
 #line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = self->priv->busy;
 #line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = !_tmp2_;
-#line 6251 "ImportPage.c"
+#line 6242 "ImportPage.c"
 	} else {
 #line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 6255 "ImportPage.c"
+#line 6246 "ImportPage.c"
 	}
 #line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
 #line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6261 "ImportPage.c"
+#line 6252 "ImportPage.c"
 }
 
 
@@ -6274,7 +6265,7 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
 	_tmp0_ = self->priv->refresh_error;
 #line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 6277 "ImportPage.c"
+#line 6268 "ImportPage.c"
 		const gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 #line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6285,14 +6276,14 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
 		_g_free0 (msg);
 #line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		msg = _tmp2_;
-#line 6288 "ImportPage.c"
+#line 6279 "ImportPage.c"
 	} else {
 		int _tmp3_ = 0;
 #line 912 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->refresh_result;
 #line 912 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp3_ == GP_OK) {
-#line 6295 "ImportPage.c"
+#line 6286 "ImportPage.c"
 		} else {
 			int _tmp4_ = 0;
 			gchar* _tmp5_ = NULL;
@@ -6304,14 +6295,14 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
 			_g_free0 (msg);
 #line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			msg = _tmp5_;
-#line 6307 "ImportPage.c"
+#line 6298 "ImportPage.c"
 		}
 	}
 #line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = msg;
 #line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6314 "ImportPage.c"
+#line 6305 "ImportPage.c"
 }
 
 
@@ -6330,7 +6321,7 @@ static void import_page_update_status (ImportPage* self, gboolean busy, gboolean
 	self->priv->refreshed = _tmp1_;
 #line 925 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 6333 "ImportPage.c"
+#line 6324 "ImportPage.c"
 }
 
 
@@ -6342,7 +6333,7 @@ static void import_page_update_toolbar_state (ImportPage* self) {
 	_tmp0_ = self->priv->hide_imported;
 #line 929 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 6345 "ImportPage.c"
+#line 6336 "ImportPage.c"
 		gboolean _tmp1_ = FALSE;
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
@@ -6351,21 +6342,21 @@ static void import_page_update_toolbar_state (ImportPage* self) {
 		_tmp3_ = self->priv->busy;
 #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp3_) {
-#line 6354 "ImportPage.c"
+#line 6345 "ImportPage.c"
 			gboolean _tmp4_ = FALSE;
 #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp4_ = self->priv->refreshed;
 #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp2_ = _tmp4_;
-#line 6360 "ImportPage.c"
+#line 6351 "ImportPage.c"
 		} else {
 #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp2_ = FALSE;
-#line 6364 "ImportPage.c"
+#line 6355 "ImportPage.c"
 		}
 #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp2_) {
-#line 6368 "ImportPage.c"
+#line 6359 "ImportPage.c"
 			ViewCollection* _tmp5_ = NULL;
 			ViewCollection* _tmp6_ = NULL;
 			gint _tmp7_ = 0;
@@ -6379,17 +6370,17 @@ static void import_page_update_toolbar_state (ImportPage* self) {
 			_tmp1_ = _tmp7_ > 0;
 #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_data_collection_unref0 (_tmp6_);
-#line 6382 "ImportPage.c"
+#line 6373 "ImportPage.c"
 		} else {
 #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp1_ = FALSE;
-#line 6386 "ImportPage.c"
+#line 6377 "ImportPage.c"
 		}
 #line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = self->priv->hide_imported;
 #line 930 "/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 6392 "ImportPage.c"
+#line 6383 "ImportPage.c"
 	}
 }
 
@@ -6409,21 +6400,21 @@ static void import_page_on_view_changed (ImportPage* self) {
 	_tmp2_ = self->priv->busy;
 #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp2_) {
-#line 6412 "ImportPage.c"
+#line 6403 "ImportPage.c"
 		gboolean _tmp3_ = FALSE;
 #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->refreshed;
 #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = _tmp3_;
-#line 6418 "ImportPage.c"
+#line 6409 "ImportPage.c"
 	} else {
 #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = FALSE;
-#line 6422 "ImportPage.c"
+#line 6413 "ImportPage.c"
 	}
 #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 6426 "ImportPage.c"
+#line 6417 "ImportPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -6437,11 +6428,11 @@ static void import_page_on_view_changed (ImportPage* self) {
 		_tmp0_ = _tmp6_ > 0;
 #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 6440 "ImportPage.c"
+#line 6431 "ImportPage.c"
 	} else {
 #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 6444 "ImportPage.c"
+#line 6435 "ImportPage.c"
 	}
 #line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", _tmp0_);
@@ -6449,21 +6440,21 @@ static void import_page_on_view_changed (ImportPage* self) {
 	_tmp9_ = self->priv->busy;
 #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp9_) {
-#line 6452 "ImportPage.c"
+#line 6443 "ImportPage.c"
 		gboolean _tmp10_ = FALSE;
 #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = self->priv->refreshed;
 #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = _tmp10_;
-#line 6458 "ImportPage.c"
+#line 6449 "ImportPage.c"
 	} else {
 #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = FALSE;
-#line 6462 "ImportPage.c"
+#line 6453 "ImportPage.c"
 	}
 #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp8_) {
-#line 6466 "ImportPage.c"
+#line 6457 "ImportPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
@@ -6477,11 +6468,11 @@ static void import_page_on_view_changed (ImportPage* self) {
 		_tmp7_ = _tmp13_ > 0;
 #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp12_);
-#line 6480 "ImportPage.c"
+#line 6471 "ImportPage.c"
 	} else {
 #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = FALSE;
-#line 6484 "ImportPage.c"
+#line 6475 "ImportPage.c"
 	}
 #line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", _tmp7_);
@@ -6489,7 +6480,7 @@ static void import_page_on_view_changed (ImportPage* self) {
 	_tmp15_ = self->priv->busy;
 #line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp15_) {
-#line 6492 "ImportPage.c"
+#line 6483 "ImportPage.c"
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
 		gint _tmp18_ = 0;
@@ -6503,17 +6494,17 @@ static void import_page_on_view_changed (ImportPage* self) {
 		_tmp14_ = _tmp18_ > 0;
 #line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 6506 "ImportPage.c"
+#line 6497 "ImportPage.c"
 	} else {
 #line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = FALSE;
-#line 6510 "ImportPage.c"
+#line 6501 "ImportPage.c"
 	}
 #line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSelectAll", _tmp14_);
 #line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_toolbar_state (self);
-#line 6516 "ImportPage.c"
+#line 6507 "ImportPage.c"
 }
 
 
@@ -6525,7 +6516,7 @@ static void import_page_on_media_added_removed (ImportPage* self) {
 	_tmp0_ = self->priv->search_filter;
 #line 942 "/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 6528 "ImportPage.c"
+#line 6519 "ImportPage.c"
 }
 
 
@@ -6563,7 +6554,7 @@ static void import_page_on_display_titles (ImportPage* self, GSimpleAction* acti
 	_tmp5_ = value;
 #line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6566 "ImportPage.c"
+#line 6557 "ImportPage.c"
 }
 
 
@@ -6586,7 +6577,7 @@ static void import_page_real_switched_to (Page* base) {
 	_g_object_unref0 (_tmp1_);
 #line 957 "/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 6589 "ImportPage.c"
+#line 6580 "ImportPage.c"
 }
 
 
@@ -6601,7 +6592,7 @@ static void import_page_real_ready (Page* base) {
 	_tmp0_ = self->priv->hide_imported_filter;
 #line 962 "/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 6604 "ImportPage.c"
+#line 6595 "ImportPage.c"
 }
 
 
@@ -6620,20 +6611,20 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 	if (_tmp1_) {
 #line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = TRUE;
-#line 6623 "ImportPage.c"
+#line 6614 "ImportPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
 #line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = self->priv->busy;
 #line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp2_;
-#line 6630 "ImportPage.c"
+#line 6621 "ImportPage.c"
 	}
 #line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
 #line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 6636 "ImportPage.c"
+#line 6627 "ImportPage.c"
 	}
 #line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = import_page_refresh_camera (self);
@@ -6647,15 +6638,15 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 		case IMPORT_PAGE_REFRESH_RESULT_OK:
 #line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_BUSY:
-#line 6650 "ImportPage.c"
+#line 6641 "ImportPage.c"
 		{
 #line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 6654 "ImportPage.c"
+#line 6645 "ImportPage.c"
 		}
 #line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_LOCKED:
-#line 6658 "ImportPage.c"
+#line 6649 "ImportPage.c"
 		{
 			gboolean _tmp5_ = FALSE;
 			const gchar* _tmp6_ = NULL;
@@ -6672,7 +6663,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL);
 #line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 6675 "ImportPage.c"
+#line 6666 "ImportPage.c"
 			}
 #line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = self->priv->uri;
@@ -6686,7 +6677,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 			uri = _tmp8_;
 #line 990 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			mount = NULL;
-#line 6689 "ImportPage.c"
+#line 6680 "ImportPage.c"
 			{
 				GMount* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
@@ -6700,7 +6691,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_tmp9_ = _tmp11_;
 #line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6703 "ImportPage.c"
+#line 6694 "ImportPage.c"
 					goto __catch62_g_error;
 				}
 #line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6713,7 +6704,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				mount = _tmp12_;
 #line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp9_);
-#line 6716 "ImportPage.c"
+#line 6707 "ImportPage.c"
 			}
 			goto __finally62;
 			__catch62_g_error:
@@ -6725,7 +6716,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_inner_error_ = NULL;
 #line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_error_free0 (err);
-#line 6728 "ImportPage.c"
+#line 6719 "ImportPage.c"
 			}
 			__finally62:
 #line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6740,13 +6731,13 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				g_clear_error (&_inner_error_);
 #line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return;
-#line 6743 "ImportPage.c"
+#line 6734 "ImportPage.c"
 			}
 #line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp13_ = mount;
 #line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp13_ != NULL) {
-#line 6749 "ImportPage.c"
+#line 6740 "ImportPage.c"
 				gchar* mounted_message = NULL;
 				const gchar* _tmp14_ = NULL;
 				gchar* _tmp15_ = NULL;
@@ -6811,26 +6802,26 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_tmp27_ = dialog_res;
 #line 1009 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp27_ != ((gint) GTK_RESPONSE_YES)) {
-#line 6813 "ImportPage.c"
+#line 6804 "ImportPage.c"
 					const gchar* _tmp28_ = NULL;
 #line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp28_ = _ ("Please unmount the camera.");
 #line 1010 "/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 6819 "ImportPage.c"
+#line 6810 "ImportPage.c"
 				} else {
 					GMount* _tmp29_ = NULL;
 #line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp29_ = mount;
 #line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					import_page_unmount_camera (self, _tmp29_);
-#line 6826 "ImportPage.c"
+#line 6817 "ImportPage.c"
 				}
 #line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (dialog);
 #line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (mounted_message);
-#line 6832 "ImportPage.c"
+#line 6823 "ImportPage.c"
 			} else {
 				gchar* locked_message = NULL;
 				const gchar* _tmp30_ = NULL;
@@ -6889,7 +6880,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_g_object_unref0 (dialog);
 #line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (locked_message);
-#line 6889 "ImportPage.c"
+#line 6880 "ImportPage.c"
 			}
 #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (mount);
@@ -6897,11 +6888,11 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 			_g_object_unref0 (uri);
 #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 6897 "ImportPage.c"
+#line 6888 "ImportPage.c"
 		}
 #line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR:
-#line 6901 "ImportPage.c"
+#line 6892 "ImportPage.c"
 		{
 			const gchar* _tmp41_ = NULL;
 			gchar* _tmp42_ = NULL;
@@ -6926,7 +6917,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 			_g_free0 (_tmp43_);
 #line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 6926 "ImportPage.c"
+#line 6917 "ImportPage.c"
 		}
 		default:
 		{
@@ -6935,7 +6926,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 			_tmp46_ = res;
 #line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_error ("ImportPage.vala:1035: Unknown result type %d", (gint) _tmp46_);
-#line 6935 "ImportPage.c"
+#line 6926 "ImportPage.c"
 		}
 	}
 }
@@ -6944,7 +6935,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 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_unmounted ((ImportPage*) self, _sender);
-#line 6944 "ImportPage.c"
+#line 6935 "ImportPage.c"
 }
 
 
@@ -6953,7 +6944,7 @@ static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* sou
 	import_page_on_unmount_finished ((ImportPage*) self, source_object, res);
 #line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_unref (self);
-#line 6953 "ImportPage.c"
+#line 6944 "ImportPage.c"
 }
 
 
@@ -6983,7 +6974,7 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
 		result = FALSE;
 #line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 6983 "ImportPage.c"
+#line 6974 "ImportPage.c"
 	}
 #line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, TRUE, FALSE);
@@ -7031,7 +7022,7 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
 	result = TRUE;
 #line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 7031 "ImportPage.c"
+#line 7022 "ImportPage.c"
 }
 
 
@@ -7054,7 +7045,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 1064 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	mount = _tmp1_;
-#line 7054 "ImportPage.c"
+#line 7045 "ImportPage.c"
 	{
 		GAsyncResult* _tmp2_ = NULL;
 #line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7063,7 +7054,7 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 		g_mount_unmount_with_operation_finish (mount, _tmp2_, &_inner_error_);
 #line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7063 "ImportPage.c"
+#line 7054 "ImportPage.c"
 			goto __catch63_g_error;
 		}
 	}
@@ -7104,7 +7095,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 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 7104 "ImportPage.c"
+#line 7095 "ImportPage.c"
 	}
 	__finally63:
 #line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7117,11 +7108,11 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 		g_clear_error (&_inner_error_);
 #line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 7117 "ImportPage.c"
+#line 7108 "ImportPage.c"
 	}
 #line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (mount);
-#line 7121 "ImportPage.c"
+#line 7112 "ImportPage.c"
 }
 
 
@@ -7154,7 +7145,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 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_try_refreshing_camera (self, TRUE);
-#line 7154 "ImportPage.c"
+#line 7145 "ImportPage.c"
 }
 
 
@@ -7179,7 +7170,7 @@ static void import_page_clear_all_import_sources (ImportPage* self) {
 	source_collection_destroy_marked (_tmp2_, marker, FALSE, NULL, NULL, NULL);
 #line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (marker);
-#line 7179 "ImportPage.c"
+#line 7170 "ImportPage.c"
 }
 
 
@@ -7251,7 +7242,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 		_g_free0 (fulldir);
 #line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7251 "ImportPage.c"
+#line 7242 "ImportPage.c"
 	}
 #line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = self->priv->camera;
@@ -7279,7 +7270,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 		_g_free0 (fulldir);
 #line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7279 "ImportPage.c"
+#line 7270 "ImportPage.c"
 	}
 #line 1121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = folders;
@@ -7287,19 +7278,19 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 	_tmp16_ = gp_list_count (_tmp15_);
 #line 1121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	list_len = _tmp16_;
-#line 7287 "ImportPage.c"
+#line 7278 "ImportPage.c"
 	{
 		gint list_index = 0;
 #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		list_index = 0;
-#line 7292 "ImportPage.c"
+#line 7283 "ImportPage.c"
 		{
 			gboolean _tmp17_ = FALSE;
 #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = TRUE;
 #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 7299 "ImportPage.c"
+#line 7290 "ImportPage.c"
 				gint _tmp19_ = 0;
 				gint _tmp20_ = 0;
 				gchar* tmp = NULL;
@@ -7311,13 +7302,13 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 				const gchar* _tmp26_ = NULL;
 #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp17_) {
-#line 7311 "ImportPage.c"
+#line 7302 "ImportPage.c"
 					gint _tmp18_ = 0;
 #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp18_ = list_index;
 #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					list_index = _tmp18_ + 1;
-#line 7317 "ImportPage.c"
+#line 7308 "ImportPage.c"
 				}
 #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp17_ = FALSE;
@@ -7329,7 +7320,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 				if (!(_tmp19_ < _tmp20_)) {
 #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 7329 "ImportPage.c"
+#line 7320 "ImportPage.c"
 				}
 #line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = folders;
@@ -7359,11 +7350,11 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 					_g_free0 (fulldir);
 #line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 7359 "ImportPage.c"
+#line 7350 "ImportPage.c"
 				}
 #line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (tmp);
-#line 7363 "ImportPage.c"
+#line 7354 "ImportPage.c"
 			}
 		}
 	}
@@ -7375,7 +7366,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 	_g_free0 (fulldir);
 #line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 7375 "ImportPage.c"
+#line 7366 "ImportPage.c"
 }
 
 
@@ -7430,7 +7421,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 		result = IMPORT_PAGE_REFRESH_RESULT_BUSY;
 #line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7430 "ImportPage.c"
+#line 7421 "ImportPage.c"
 	}
 #line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _ ("Starting import, please wait…");
@@ -7458,7 +7449,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 	_tmp7_ = self->priv->refresh_result;
 #line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp7_ != GP_OK) {
-#line 7458 "ImportPage.c"
+#line 7449 "ImportPage.c"
 		int _tmp8_ = 0;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
@@ -7480,17 +7471,17 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 		if (_tmp12_ == GP_ERROR_IO_LOCK) {
 #line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 7480 "ImportPage.c"
+#line 7471 "ImportPage.c"
 		} else {
 #line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 7484 "ImportPage.c"
+#line 7475 "ImportPage.c"
 		}
 #line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp11_;
 #line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7490 "ImportPage.c"
+#line 7481 "ImportPage.c"
 	}
 #line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = self->priv->refreshed;
@@ -7544,19 +7535,19 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 	_tmp26_ = self->priv->refresh_result;
 #line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp26_ == GP_OK) {
-#line 7544 "ImportPage.c"
+#line 7535 "ImportPage.c"
 		{
 			gint fsid = 0;
 #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			fsid = 0;
-#line 7549 "ImportPage.c"
+#line 7540 "ImportPage.c"
 			{
 				gboolean _tmp27_ = FALSE;
 #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp27_ = TRUE;
 #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				while (TRUE) {
-#line 7556 "ImportPage.c"
+#line 7547 "ImportPage.c"
 					gint _tmp29_ = 0;
 					gint _tmp30_ = 0;
 					gboolean got_well_known_dir = FALSE;
@@ -7583,13 +7574,13 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					gboolean _tmp71_ = FALSE;
 #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp27_) {
-#line 7583 "ImportPage.c"
+#line 7574 "ImportPage.c"
 						gint _tmp28_ = 0;
 #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp28_ = fsid;
 #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						fsid = _tmp28_ + 1;
-#line 7589 "ImportPage.c"
+#line 7580 "ImportPage.c"
 					}
 #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp27_ = FALSE;
@@ -7601,7 +7592,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					if (!(_tmp29_ < _tmp30_)) {
 #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						break;
-#line 7601 "ImportPage.c"
+#line 7592 "ImportPage.c"
 					}
 #line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					got_well_known_dir = FALSE;
@@ -7611,7 +7602,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp32_ = import_page_check_directory_exists (self, _tmp31_, "/", "DCIM");
 #line 1173 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp32_) {
-#line 7611 "ImportPage.c"
+#line 7602 "ImportPage.c"
 						gint _tmp33_ = 0;
 						GeeArrayList* _tmp34_ = NULL;
 #line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7622,7 +7613,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp33_, "/DCIM", _tmp34_);
 #line 1175 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7622 "ImportPage.c"
+#line 7613 "ImportPage.c"
 					}
 #line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = fsid;
@@ -7630,7 +7621,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp36_ = import_page_check_directory_exists (self, _tmp35_, "/", "dcim");
 #line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp36_) {
-#line 7630 "ImportPage.c"
+#line 7621 "ImportPage.c"
 						gint _tmp37_ = 0;
 						GeeArrayList* _tmp38_ = NULL;
 #line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7641,7 +7632,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp37_, "/dcim", _tmp38_);
 #line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7641 "ImportPage.c"
+#line 7632 "ImportPage.c"
 					}
 #line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp39_ = fsid;
@@ -7649,7 +7640,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp40_ = import_page_check_directory_exists (self, _tmp39_, "/PRIVATE/", "AVCHD");
 #line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp40_) {
-#line 7649 "ImportPage.c"
+#line 7640 "ImportPage.c"
 						gint _tmp41_ = 0;
 						GeeArrayList* _tmp42_ = NULL;
 #line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7660,7 +7651,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp41_, "/PRIVATE/AVCHD", _tmp42_);
 #line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7660 "ImportPage.c"
+#line 7651 "ImportPage.c"
 					}
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp43_ = fsid;
@@ -7668,7 +7659,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp44_ = import_page_check_directory_exists (self, _tmp43_, "/private/", "avchd");
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp44_) {
-#line 7668 "ImportPage.c"
+#line 7659 "ImportPage.c"
 						gint _tmp45_ = 0;
 						GeeArrayList* _tmp46_ = NULL;
 #line 1189 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7679,7 +7670,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp45_, "/private/avchd", _tmp46_);
 #line 1190 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7679 "ImportPage.c"
+#line 7670 "ImportPage.c"
 					}
 #line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp47_ = fsid;
@@ -7687,7 +7678,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp48_ = import_page_check_directory_exists (self, _tmp47_, "/", "AVCHD");
 #line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp48_) {
-#line 7687 "ImportPage.c"
+#line 7678 "ImportPage.c"
 						gint _tmp49_ = 0;
 						GeeArrayList* _tmp50_ = NULL;
 #line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7698,7 +7689,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp49_, "/AVCHD", _tmp50_);
 #line 1194 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7698 "ImportPage.c"
+#line 7689 "ImportPage.c"
 					}
 #line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp51_ = fsid;
@@ -7706,7 +7697,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp52_ = import_page_check_directory_exists (self, _tmp51_, "/", "avchd");
 #line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp52_) {
-#line 7706 "ImportPage.c"
+#line 7697 "ImportPage.c"
 						gint _tmp53_ = 0;
 						GeeArrayList* _tmp54_ = NULL;
 #line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7717,7 +7708,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp53_, "/avchd", _tmp54_);
 #line 1198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7717 "ImportPage.c"
+#line 7708 "ImportPage.c"
 					}
 #line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp55_ = fsid;
@@ -7725,7 +7716,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp56_ = import_page_check_directory_exists (self, _tmp55_, "/PRIVATE/", "SONY");
 #line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp56_) {
-#line 7725 "ImportPage.c"
+#line 7716 "ImportPage.c"
 						gint _tmp57_ = 0;
 						GeeArrayList* _tmp58_ = NULL;
 #line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7736,7 +7727,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp57_, "/PRIVATE/SONY", _tmp58_);
 #line 1205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7736 "ImportPage.c"
+#line 7727 "ImportPage.c"
 					}
 #line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp59_ = fsid;
@@ -7744,7 +7735,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp60_ = import_page_check_directory_exists (self, _tmp59_, "/private/", "sony");
 #line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp60_) {
-#line 7744 "ImportPage.c"
+#line 7735 "ImportPage.c"
 						gint _tmp61_ = 0;
 						GeeArrayList* _tmp62_ = NULL;
 #line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7755,7 +7746,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp61_, "/private/sony", _tmp62_);
 #line 1209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7755 "ImportPage.c"
+#line 7746 "ImportPage.c"
 					}
 #line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp63_ = fsid;
@@ -7763,7 +7754,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp64_ = import_page_check_directory_exists (self, _tmp63_, "/", "MP_ROOT");
 #line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp64_) {
-#line 7763 "ImportPage.c"
+#line 7754 "ImportPage.c"
 						gint _tmp65_ = 0;
 						GeeArrayList* _tmp66_ = NULL;
 #line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7774,7 +7765,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp65_, "/MP_ROOT", _tmp66_);
 #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7774 "ImportPage.c"
+#line 7765 "ImportPage.c"
 					}
 #line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp67_ = fsid;
@@ -7782,7 +7773,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp68_ = import_page_check_directory_exists (self, _tmp67_, "/", "mp_root");
 #line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp68_) {
-#line 7782 "ImportPage.c"
+#line 7773 "ImportPage.c"
 						gint _tmp69_ = 0;
 						GeeArrayList* _tmp70_ = NULL;
 #line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7793,13 +7784,13 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp69_, "/mp_root", _tmp70_);
 #line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7793 "ImportPage.c"
+#line 7784 "ImportPage.c"
 					}
 #line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp71_ = got_well_known_dir;
 #line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp71_) {
-#line 7799 "ImportPage.c"
+#line 7790 "ImportPage.c"
 						gint _tmp72_ = 0;
 						GeeArrayList* _tmp73_ = NULL;
 						gboolean _tmp74_ = FALSE;
@@ -7813,7 +7804,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						if (!_tmp74_) {
 #line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							break;
-#line 7813 "ImportPage.c"
+#line 7804 "ImportPage.c"
 						}
 					}
 				}
@@ -7860,7 +7851,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 	_tmp85_ = res;
 #line 1254 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp85_ != GP_OK) {
-#line 7860 "ImportPage.c"
+#line 7851 "ImportPage.c"
 		int _tmp86_ = 0;
 		gchar* _tmp87_ = NULL;
 		gchar* _tmp88_ = NULL;
@@ -7874,13 +7865,13 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 		g_warning ("ImportPage.vala:1256: Unable to unlock camera: %s", _tmp88_);
 #line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp88_);
-#line 7874 "ImportPage.c"
+#line 7865 "ImportPage.c"
 	}
 #line 1259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp89_ = self->priv->refresh_result;
 #line 1259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp89_ == GP_OK) {
-#line 7880 "ImportPage.c"
+#line 7871 "ImportPage.c"
 		SourceCollection* _tmp90_ = NULL;
 		gint _tmp91_ = 0;
 #line 1260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7889,7 +7880,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 1260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp91_ == 0) {
-#line 7889 "ImportPage.c"
+#line 7880 "ImportPage.c"
 			gchar* _tmp92_ = NULL;
 			gchar* _tmp93_ = NULL;
 #line 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7900,17 +7891,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 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp93_);
-#line 7900 "ImportPage.c"
+#line 7891 "ImportPage.c"
 		}
 #line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, TRUE);
-#line 7904 "ImportPage.c"
+#line 7895 "ImportPage.c"
 	} else {
 #line 1265 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, FALSE);
 #line 1268 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_clear_all_import_sources (self);
-#line 7910 "ImportPage.c"
+#line 7901 "ImportPage.c"
 	}
 #line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
@@ -7920,7 +7911,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 	switch (_tmp94_) {
 #line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case GP_OK:
-#line 7920 "ImportPage.c"
+#line 7911 "ImportPage.c"
 		{
 #line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_OK;
@@ -7928,11 +7919,11 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 			_g_object_unref0 (import_list);
 #line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 7928 "ImportPage.c"
+#line 7919 "ImportPage.c"
 		}
 #line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case GP_ERROR_IO_LOCK:
-#line 7932 "ImportPage.c"
+#line 7923 "ImportPage.c"
 		{
 #line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
@@ -7940,7 +7931,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 			_g_object_unref0 (import_list);
 #line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 7940 "ImportPage.c"
+#line 7931 "ImportPage.c"
 		}
 		default:
 		{
@@ -7950,12 +7941,12 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 			_g_object_unref0 (import_list);
 #line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 7950 "ImportPage.c"
+#line 7941 "ImportPage.c"
 		}
 	}
 #line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (import_list);
-#line 7955 "ImportPage.c"
+#line 7946 "ImportPage.c"
 }
 
 
@@ -7963,17 +7954,17 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 7973 "ImportPage.c"
+#line 7964 "ImportPage.c"
 }
 
 
@@ -7994,105 +7985,105 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 8006 "ImportPage.c"
+#line 7997 "ImportPage.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 8015 "ImportPage.c"
+#line 8006 "ImportPage.c"
 	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 8021 "ImportPage.c"
+#line 8012 "ImportPage.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 8030 "ImportPage.c"
+#line 8021 "ImportPage.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 8036 "ImportPage.c"
+#line 8027 "ImportPage.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 8045 "ImportPage.c"
+#line 8036 "ImportPage.c"
 	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 8049 "ImportPage.c"
+#line 8040 "ImportPage.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 8057 "ImportPage.c"
+#line 8048 "ImportPage.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 8066 "ImportPage.c"
+#line 8057 "ImportPage.c"
 	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 8070 "ImportPage.c"
+#line 8061 "ImportPage.c"
 	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 8092 "ImportPage.c"
+#line 8083 "ImportPage.c"
 }
 
 
@@ -8115,7 +8106,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 	offset = (glong) _tmp2_;
 #line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	while (TRUE) {
-#line 8115 "ImportPage.c"
+#line 8106 "ImportPage.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		const gchar* _tmp5_ = NULL;
@@ -8132,7 +8123,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 		if (!(_tmp4_ >= ((glong) 0))) {
 #line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 8132 "ImportPage.c"
+#line 8123 "ImportPage.c"
 		}
 #line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = str;
@@ -8144,7 +8135,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 		_tmp8_ = ch;
 #line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp7_ != _tmp8_) {
-#line 8144 "ImportPage.c"
+#line 8135 "ImportPage.c"
 			const gchar* _tmp9_ = NULL;
 			glong _tmp10_ = 0L;
 			gchar* _tmp11_ = NULL;
@@ -8158,7 +8149,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 			result = _tmp11_;
 #line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8158 "ImportPage.c"
+#line 8149 "ImportPage.c"
 		}
 	}
 #line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8167,7 +8158,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 	result = _tmp12_;
 #line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8167 "ImportPage.c"
+#line 8158 "ImportPage.c"
 }
 
 
@@ -8186,7 +8177,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 	_tmp2_ = g_str_has_suffix (_tmp1_, "/");
 #line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp2_) {
-#line 8186 "ImportPage.c"
+#line 8177 "ImportPage.c"
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
 #line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8195,15 +8186,15 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 		_tmp4_ = g_str_has_prefix (_tmp3_, "/");
 #line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 8195 "ImportPage.c"
+#line 8186 "ImportPage.c"
 	} else {
 #line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 8199 "ImportPage.c"
+#line 8190 "ImportPage.c"
 	}
 #line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 8203 "ImportPage.c"
+#line 8194 "ImportPage.c"
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -8228,7 +8219,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 		result = _tmp10_;
 #line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8228 "ImportPage.c"
+#line 8219 "ImportPage.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
 		const gchar* _tmp12_ = NULL;
@@ -8239,7 +8230,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 		_tmp13_ = g_str_has_suffix (_tmp12_, "/");
 #line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp13_) {
-#line 8239 "ImportPage.c"
+#line 8230 "ImportPage.c"
 			const gchar* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
 #line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8248,15 +8239,15 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 			_tmp15_ = g_str_has_prefix (_tmp14_, "/");
 #line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = _tmp15_;
-#line 8248 "ImportPage.c"
+#line 8239 "ImportPage.c"
 		} else {
 #line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = FALSE;
-#line 8252 "ImportPage.c"
+#line 8243 "ImportPage.c"
 		}
 #line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_) {
-#line 8256 "ImportPage.c"
+#line 8247 "ImportPage.c"
 			const gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
@@ -8281,7 +8272,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 			result = _tmp21_;
 #line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8281 "ImportPage.c"
+#line 8272 "ImportPage.c"
 		} else {
 			const gchar* _tmp22_ = NULL;
 			const gchar* _tmp23_ = NULL;
@@ -8296,7 +8287,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 			result = _tmp24_;
 #line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8296 "ImportPage.c"
+#line 8287 "ImportPage.c"
 		}
 	}
 }
@@ -8348,7 +8339,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 		result = NULL;
 #line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8348 "ImportPage.c"
+#line 8339 "ImportPage.c"
 	}
 #line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = fsid;
@@ -8360,7 +8351,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 		result = NULL;
 #line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8360 "ImportPage.c"
+#line 8351 "ImportPage.c"
 	}
 #line 1316 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = sifs;
@@ -8374,7 +8365,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 	_tmp12_ = (*_tmp11_).fields;
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((_tmp12_ & GP_STORAGEINFO_BASE) != 0) {
-#line 8374 "ImportPage.c"
+#line 8365 "ImportPage.c"
 		CameraStorageInformation* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8383,11 +8374,11 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 		_tmp14_ = (*_tmp13_).basedir;
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp14_;
-#line 8383 "ImportPage.c"
+#line 8374 "ImportPage.c"
 	} else {
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = "/";
-#line 8387 "ImportPage.c"
+#line 8378 "ImportPage.c"
 	}
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = g_strdup (_tmp10_);
@@ -8395,7 +8386,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 	result = _tmp15_;
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8395 "ImportPage.c"
+#line 8386 "ImportPage.c"
 }
 
 
@@ -8430,7 +8421,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
 		result = NULL;
 #line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8430 "ImportPage.c"
+#line 8421 "ImportPage.c"
 	}
 #line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = camera;
@@ -8444,7 +8435,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
 	_tmp6_ = basedir;
 #line 1326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ == NULL) {
-#line 8444 "ImportPage.c"
+#line 8435 "ImportPage.c"
 		const gchar* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		const gchar* _tmp9_ = NULL;
@@ -8465,7 +8456,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
 		_g_free0 (basedir);
 #line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8465 "ImportPage.c"
+#line 8456 "ImportPage.c"
 	}
 #line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = basedir;
@@ -8479,7 +8470,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
 	_g_free0 (basedir);
 #line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8479 "ImportPage.c"
+#line 8470 "ImportPage.c"
 }
 
 
@@ -8537,7 +8528,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	_tmp5_ = fulldir;
 #line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ == NULL) {
-#line 8537 "ImportPage.c"
+#line 8528 "ImportPage.c"
 		const gchar* _tmp6_ = NULL;
 #line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = dir;
@@ -8549,7 +8540,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 		_g_free0 (fulldir);
 #line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8549 "ImportPage.c"
+#line 8540 "ImportPage.c"
 	}
 #line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = gp_list_new (&_tmp7_);
@@ -8563,7 +8554,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	_tmp9_ = self->priv->refresh_result;
 #line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp9_ != GP_OK) {
-#line 8563 "ImportPage.c"
+#line 8554 "ImportPage.c"
 		int _tmp10_ = 0;
 		gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
@@ -8585,7 +8576,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 		_g_free0 (fulldir);
 #line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8585 "ImportPage.c"
+#line 8576 "ImportPage.c"
 	}
 #line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = self->priv->camera;
@@ -8605,7 +8596,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	_tmp19_ = self->priv->refresh_result;
 #line 1352 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp19_ != GP_OK) {
-#line 8605 "ImportPage.c"
+#line 8596 "ImportPage.c"
 		const gchar* _tmp20_ = NULL;
 		int _tmp21_ = 0;
 		gchar* _tmp22_ = NULL;
@@ -8632,20 +8623,20 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 		_g_free0 (fulldir);
 #line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8632 "ImportPage.c"
+#line 8623 "ImportPage.c"
 	}
 	{
 		gint ctr = 0;
 #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ctr = 0;
-#line 8638 "ImportPage.c"
+#line 8629 "ImportPage.c"
 		{
 			gboolean _tmp24_ = FALSE;
 #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp24_ = TRUE;
 #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 8645 "ImportPage.c"
+#line 8636 "ImportPage.c"
 				gint _tmp26_ = 0;
 				CameraList* _tmp27_ = NULL;
 				gint _tmp28_ = 0;
@@ -8658,13 +8649,13 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				int _tmp34_ = 0;
 #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp24_) {
-#line 8658 "ImportPage.c"
+#line 8649 "ImportPage.c"
 					gint _tmp25_ = 0;
 #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp25_ = ctr;
 #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					ctr = _tmp25_ + 1;
-#line 8664 "ImportPage.c"
+#line 8655 "ImportPage.c"
 				}
 #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = FALSE;
@@ -8678,7 +8669,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				if (!(_tmp26_ < _tmp28_)) {
 #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 8678 "ImportPage.c"
+#line 8669 "ImportPage.c"
 				}
 #line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = files;
@@ -8698,7 +8689,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				_tmp34_ = self->priv->refresh_result;
 #line 1364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp34_ != GP_OK) {
-#line 8698 "ImportPage.c"
+#line 8689 "ImportPage.c"
 					gint _tmp35_ = 0;
 					const gchar* _tmp36_ = NULL;
 					int _tmp37_ = 0;
@@ -8728,7 +8719,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					_g_free0 (fulldir);
 #line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 8728 "ImportPage.c"
+#line 8719 "ImportPage.c"
 				}
 				{
 					CameraFileInfo info = {0};
@@ -8768,12 +8759,12 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
-#line 8768 "ImportPage.c"
+#line 8759 "ImportPage.c"
 						goto __catch64_g_error;
 					}
 #line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp40_) {
-#line 8773 "ImportPage.c"
+#line 8764 "ImportPage.c"
 						const gchar* _tmp48_ = NULL;
 						const gchar* _tmp49_ = NULL;
 #line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8788,7 +8779,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 						_g_free0 (filename);
 #line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						continue;
-#line 8788 "ImportPage.c"
+#line 8779 "ImportPage.c"
 					}
 #line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp50_ = info;
@@ -8798,7 +8789,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					_tmp52_ = _tmp51_.fields;
 #line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if ((_tmp52_ & GP_FILE_INFO_TYPE) == 0) {
-#line 8798 "ImportPage.c"
+#line 8789 "ImportPage.c"
 						const gchar* _tmp53_ = NULL;
 						const gchar* _tmp54_ = NULL;
 						CameraFileInfo _tmp55_ = {0};
@@ -8822,7 +8813,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 						_g_free0 (filename);
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						continue;
-#line 8822 "ImportPage.c"
+#line 8813 "ImportPage.c"
 					}
 #line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp58_ = filename;
@@ -8830,7 +8821,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					_tmp59_ = video_reader_is_supported_video_filename (_tmp58_);
 #line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp59_) {
-#line 8830 "ImportPage.c"
+#line 8821 "ImportPage.c"
 						VideoImportSource* video_source = NULL;
 						const gchar* _tmp60_ = NULL;
 						Camera* _tmp61_ = NULL;
@@ -8880,7 +8871,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 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (video_source);
-#line 8880 "ImportPage.c"
+#line 8871 "ImportPage.c"
 					} else {
 						PhotoFileFormat file_format = 0;
 						CameraFileInfo _tmp74_ = {0};
@@ -8917,7 +8908,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 						_tmp78_ = file_format;
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (_tmp78_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 8917 "ImportPage.c"
+#line 8908 "ImportPage.c"
 							const gchar* _tmp79_ = NULL;
 							PhotoFileFormat _tmp80_ = 0;
 							PhotoFileFormat _tmp81_ = 0;
@@ -8931,7 +8922,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 							_tmp81_ = file_format;
 #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							if (_tmp81_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 8931 "ImportPage.c"
+#line 8922 "ImportPage.c"
 								const gchar* _tmp82_ = NULL;
 								const gchar* _tmp83_ = NULL;
 								CameraFileInfo _tmp84_ = {0};
@@ -8956,7 +8947,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 								_g_free0 (filename);
 #line 1399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								continue;
-#line 8955 "ImportPage.c"
+#line 8946 "ImportPage.c"
 							}
 						}
 #line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8993,7 +8984,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 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp101_);
-#line 8992 "ImportPage.c"
+#line 8983 "ImportPage.c"
 					}
 #line 1406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp102_ = self->priv->progress_bar;
@@ -9003,7 +8994,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					spin_event_loop ();
 #line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					 (info);
-#line 9002 "ImportPage.c"
+#line 8993 "ImportPage.c"
 				}
 				goto __finally64;
 				__catch64_g_error:
@@ -9049,7 +9040,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					_g_free0 (fulldir);
 #line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9048 "ImportPage.c"
+#line 9039 "ImportPage.c"
 				}
 				__finally64:
 #line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9066,11 +9057,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					g_clear_error (&_inner_error_);
 #line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return FALSE;
-#line 9065 "ImportPage.c"
+#line 9056 "ImportPage.c"
 				}
 #line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 9069 "ImportPage.c"
+#line 9060 "ImportPage.c"
 			}
 		}
 	}
@@ -9086,7 +9077,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	_tmp111_ = self->priv->refresh_result;
 #line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp111_ != GP_OK) {
-#line 9085 "ImportPage.c"
+#line 9076 "ImportPage.c"
 		int _tmp112_ = 0;
 		gchar* _tmp113_ = NULL;
 		gchar* _tmp114_ = NULL;
@@ -9110,7 +9101,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 		_g_free0 (fulldir);
 #line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 9109 "ImportPage.c"
+#line 9100 "ImportPage.c"
 	}
 #line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp115_ = self->priv->camera;
@@ -9130,7 +9121,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	_tmp121_ = self->priv->refresh_result;
 #line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp121_ != GP_OK) {
-#line 9129 "ImportPage.c"
+#line 9120 "ImportPage.c"
 		const gchar* _tmp122_ = NULL;
 		int _tmp123_ = 0;
 		gchar* _tmp124_ = NULL;
@@ -9159,20 +9150,20 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 		_g_free0 (fulldir);
 #line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 9158 "ImportPage.c"
+#line 9149 "ImportPage.c"
 	}
 	{
 		gint ctr = 0;
 #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ctr = 0;
-#line 9164 "ImportPage.c"
+#line 9155 "ImportPage.c"
 		{
 			gboolean _tmp126_ = FALSE;
 #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp126_ = TRUE;
 #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 9171 "ImportPage.c"
+#line 9162 "ImportPage.c"
 				gint _tmp128_ = 0;
 				CameraList* _tmp129_ = NULL;
 				gint _tmp130_ = 0;
@@ -9193,13 +9184,13 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				gboolean _tmp148_ = FALSE;
 #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp126_) {
-#line 9192 "ImportPage.c"
+#line 9183 "ImportPage.c"
 					gint _tmp127_ = 0;
 #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp127_ = ctr;
 #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					ctr = _tmp127_ + 1;
-#line 9198 "ImportPage.c"
+#line 9189 "ImportPage.c"
 				}
 #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp126_ = FALSE;
@@ -9213,7 +9204,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				if (!(_tmp128_ < _tmp130_)) {
 #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 9212 "ImportPage.c"
+#line 9203 "ImportPage.c"
 				}
 #line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp131_ = folders;
@@ -9233,7 +9224,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				_tmp136_ = self->priv->refresh_result;
 #line 1440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp136_ != GP_OK) {
-#line 9232 "ImportPage.c"
+#line 9223 "ImportPage.c"
 					gint _tmp137_ = 0;
 					int _tmp138_ = 0;
 					gchar* _tmp139_ = NULL;
@@ -9262,7 +9253,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					_g_free0 (fulldir);
 #line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9261 "ImportPage.c"
+#line 9252 "ImportPage.c"
 				}
 #line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp141_ = fsid;
@@ -9296,11 +9287,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					_g_free0 (fulldir);
 #line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9295 "ImportPage.c"
+#line 9286 "ImportPage.c"
 				}
 #line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (subdir);
-#line 9299 "ImportPage.c"
+#line 9290 "ImportPage.c"
 			}
 		}
 	}
@@ -9314,7 +9305,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	_g_free0 (fulldir);
 #line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 9313 "ImportPage.c"
+#line 9304 "ImportPage.c"
 }
 
 
@@ -9323,19 +9314,19 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 	g_return_if_fail (IS_IMPORT_PAGE (self));
 #line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (GEE_IS_ARRAY_LIST (import_list));
-#line 9322 "ImportPage.c"
+#line 9313 "ImportPage.c"
 	{
 		gint i = 0;
 #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		i = 0;
-#line 9327 "ImportPage.c"
+#line 9318 "ImportPage.c"
 		{
 			gboolean _tmp0_ = FALSE;
 #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp0_ = TRUE;
 #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 9334 "ImportPage.c"
+#line 9325 "ImportPage.c"
 				gint _tmp2_ = 0;
 				GeeArrayList* _tmp3_ = NULL;
 				gint _tmp4_ = 0;
@@ -9361,13 +9352,13 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				PhotoImportSource* _tmp31_ = NULL;
 #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp0_) {
-#line 9360 "ImportPage.c"
+#line 9351 "ImportPage.c"
 					gint _tmp1_ = 0;
 #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp1_ = i;
 #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					i = _tmp1_ + 1;
-#line 9366 "ImportPage.c"
+#line 9357 "ImportPage.c"
 				}
 #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp0_ = FALSE;
@@ -9383,7 +9374,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				if (!(_tmp2_ < _tmp5_)) {
 #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 9382 "ImportPage.c"
+#line 9373 "ImportPage.c"
 				}
 #line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp6_ = import_list;
@@ -9399,7 +9390,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				if (_tmp10_ == NULL) {
 #line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp9_);
-#line 9398 "ImportPage.c"
+#line 9389 "ImportPage.c"
 				}
 #line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				current = _tmp10_;
@@ -9413,7 +9404,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				_tmp15_ = _tmp14_;
 #line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if ((_tmp12_ + 1) < _tmp15_) {
-#line 9412 "ImportPage.c"
+#line 9403 "ImportPage.c"
 					GeeArrayList* _tmp16_ = NULL;
 					gint _tmp17_ = 0;
 					gpointer _tmp18_ = NULL;
@@ -9433,19 +9424,19 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 					if (_tmp20_ == NULL) {
 #line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp19_);
-#line 9432 "ImportPage.c"
+#line 9423 "ImportPage.c"
 					}
 #line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp11_);
 #line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp11_ = _tmp20_;
-#line 9438 "ImportPage.c"
+#line 9429 "ImportPage.c"
 				} else {
 #line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp11_);
 #line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp11_ = NULL;
-#line 9444 "ImportPage.c"
+#line 9435 "ImportPage.c"
 				}
 #line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = _g_object_ref0 (_tmp11_);
@@ -9455,7 +9446,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				_tmp23_ = i;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp23_ > 0) {
-#line 9454 "ImportPage.c"
+#line 9445 "ImportPage.c"
 					GeeArrayList* _tmp24_ = NULL;
 					gint _tmp25_ = 0;
 					gpointer _tmp26_ = NULL;
@@ -9475,19 +9466,19 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 					if (_tmp28_ == NULL) {
 #line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp27_);
-#line 9474 "ImportPage.c"
+#line 9465 "ImportPage.c"
 					}
 #line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp22_);
 #line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp22_ = _tmp28_;
-#line 9480 "ImportPage.c"
+#line 9471 "ImportPage.c"
 				} else {
 #line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp22_);
 #line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp22_ = NULL;
-#line 9486 "ImportPage.c"
+#line 9477 "ImportPage.c"
 				}
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = _g_object_ref0 (_tmp22_);
@@ -9497,7 +9488,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				_tmp31_ = current;
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp31_ != NULL) {
-#line 9496 "ImportPage.c"
+#line 9487 "ImportPage.c"
 					PhotoImportSource* _tmp32_ = NULL;
 					PhotoFileFormat _tmp33_ = 0;
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9506,15 +9497,15 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 					_tmp33_ = photo_import_source_get_file_format (_tmp32_);
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp30_ = _tmp33_ == PHOTO_FILE_FORMAT_RAW;
-#line 9505 "ImportPage.c"
+#line 9496 "ImportPage.c"
 				} else {
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp30_ = FALSE;
-#line 9509 "ImportPage.c"
+#line 9500 "ImportPage.c"
 				}
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp30_) {
-#line 9513 "ImportPage.c"
+#line 9504 "ImportPage.c"
 					gchar* current_name = NULL;
 					gchar* ext = NULL;
 					PhotoImportSource* _tmp34_ = NULL;
@@ -9552,7 +9543,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 					_tmp40_ = next;
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp40_ != NULL) {
-#line 9551 "ImportPage.c"
+#line 9542 "ImportPage.c"
 						PhotoImportSource* _tmp41_ = NULL;
 						PhotoFileFormat _tmp42_ = 0;
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9561,15 +9552,15 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						_tmp42_ = photo_import_source_get_file_format (_tmp41_);
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp39_ = _tmp42_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9560 "ImportPage.c"
+#line 9551 "ImportPage.c"
 					} else {
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp39_ = FALSE;
-#line 9564 "ImportPage.c"
+#line 9555 "ImportPage.c"
 					}
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp39_) {
-#line 9568 "ImportPage.c"
+#line 9559 "ImportPage.c"
 						gchar* next_name = NULL;
 						PhotoImportSource* _tmp43_ = NULL;
 						gchar* _tmp44_ = NULL;
@@ -9602,7 +9593,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						_tmp49_ = current_name;
 #line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (g_strcmp0 (_tmp48_, _tmp49_) == 0) {
-#line 9601 "ImportPage.c"
+#line 9592 "ImportPage.c"
 							PhotoImportSource* _tmp50_ = NULL;
 							PhotoImportSource* _tmp51_ = NULL;
 #line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9613,17 +9604,17 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 							_g_object_unref0 (associated);
 #line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							associated = _tmp51_;
-#line 9612 "ImportPage.c"
+#line 9603 "ImportPage.c"
 						}
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (next_name);
-#line 9616 "ImportPage.c"
+#line 9607 "ImportPage.c"
 					}
 #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp53_ = prev;
 #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp53_ != NULL) {
-#line 9622 "ImportPage.c"
+#line 9613 "ImportPage.c"
 						PhotoImportSource* _tmp54_ = NULL;
 						PhotoFileFormat _tmp55_ = 0;
 #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9632,15 +9623,15 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						_tmp55_ = photo_import_source_get_file_format (_tmp54_);
 #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp52_ = _tmp55_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9631 "ImportPage.c"
+#line 9622 "ImportPage.c"
 					} else {
 #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp52_ = FALSE;
-#line 9635 "ImportPage.c"
+#line 9626 "ImportPage.c"
 					}
 #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp52_) {
-#line 9639 "ImportPage.c"
+#line 9630 "ImportPage.c"
 						gchar* prev_name = NULL;
 						PhotoImportSource* _tmp56_ = NULL;
 						gchar* _tmp57_ = NULL;
@@ -9673,7 +9664,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						_tmp62_ = current_name;
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (g_strcmp0 (_tmp61_, _tmp62_) == 0) {
-#line 9672 "ImportPage.c"
+#line 9663 "ImportPage.c"
 							PhotoImportSource* _tmp63_ = NULL;
 							PhotoImportSource* _tmp64_ = NULL;
 #line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9684,17 +9675,17 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 							_g_object_unref0 (associated);
 #line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							associated = _tmp64_;
-#line 9683 "ImportPage.c"
+#line 9674 "ImportPage.c"
 						}
 #line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (prev_name);
-#line 9687 "ImportPage.c"
+#line 9678 "ImportPage.c"
 					}
 #line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp65_ = associated;
 #line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp65_ != NULL) {
-#line 9693 "ImportPage.c"
+#line 9684 "ImportPage.c"
 						PhotoImportSource* _tmp66_ = NULL;
 						gchar* _tmp67_ = NULL;
 						gchar* _tmp68_ = NULL;
@@ -9738,7 +9729,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 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp76_) {
-#line 9737 "ImportPage.c"
+#line 9728 "ImportPage.c"
 							PhotoImportSource* _tmp77_ = NULL;
 #line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							g_debug ("ImportPage.vala:1486: Unable to associate files");
@@ -9746,7 +9737,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 							_tmp77_ = current;
 #line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							photo_import_source_set_associated (_tmp77_, NULL);
-#line 9745 "ImportPage.c"
+#line 9736 "ImportPage.c"
 						}
 					}
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9755,7 +9746,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 					_g_free0 (ext);
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (current_name);
-#line 9754 "ImportPage.c"
+#line 9745 "ImportPage.c"
 				}
 #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (prev);
@@ -9767,7 +9758,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				_g_object_unref0 (_tmp11_);
 #line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (current);
-#line 9766 "ImportPage.c"
+#line 9757 "ImportPage.c"
 			}
 		}
 	}
@@ -9783,7 +9774,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 	g_return_if_fail (GEE_IS_LIST (import_list));
 #line 1495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	loaded_photos = 0;
-#line 9782 "ImportPage.c"
+#line 9773 "ImportPage.c"
 	{
 		GeeList* _import_source_list = NULL;
 		GeeList* _tmp0_ = NULL;
@@ -9811,7 +9802,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 		_import_source_index = -1;
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 9810 "ImportPage.c"
+#line 9801 "ImportPage.c"
 			gint _tmp5_ = 0;
 			gint _tmp6_ = 0;
 			gint _tmp7_ = 0;
@@ -9874,7 +9865,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			if (!(_tmp6_ < _tmp7_)) {
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 9873 "ImportPage.c"
+#line 9864 "ImportPage.c"
 			}
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp8_ = _import_source_list;
@@ -9900,7 +9891,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			_tmp15_ = fulldir;
 #line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp15_ == NULL) {
-#line 9899 "ImportPage.c"
+#line 9890 "ImportPage.c"
 				ImportSource* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
 				gchar* _tmp18_ = NULL;
@@ -9923,7 +9914,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_object_unref0 (import_source);
 #line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				continue;
-#line 9921 "ImportPage.c"
+#line 9912 "ImportPage.c"
 			}
 #line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			associated = NULL;
@@ -9931,7 +9922,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			_tmp20_ = import_source;
 #line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 9929 "ImportPage.c"
+#line 9920 "ImportPage.c"
 				ImportSource* _tmp21_ = NULL;
 				PhotoImportSource* _tmp22_ = NULL;
 				PhotoImportSource* _tmp23_ = NULL;
@@ -9945,15 +9936,15 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp19_ = _tmp23_ != NULL;
 #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp23_);
-#line 9943 "ImportPage.c"
+#line 9934 "ImportPage.c"
 			} else {
 #line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = FALSE;
-#line 9947 "ImportPage.c"
+#line 9938 "ImportPage.c"
 			}
 #line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp19_) {
-#line 9951 "ImportPage.c"
+#line 9942 "ImportPage.c"
 				ImportSource* _tmp24_ = NULL;
 				PhotoImportSource* _tmp25_ = NULL;
 #line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9964,7 +9955,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_object_unref0 (associated);
 #line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				associated = _tmp25_;
-#line 9962 "ImportPage.c"
+#line 9953 "ImportPage.c"
 			}
 #line 1512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp26_ = self->priv->progress_bar;
@@ -9998,7 +9989,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			_tmp35_ = video_reader_is_supported_video_filename (_tmp34_);
 #line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!_tmp35_) {
-#line 9996 "ImportPage.c"
+#line 9987 "ImportPage.c"
 				{
 					PhotoMetadata* _tmp36_ = NULL;
 					GPSpinIdleWrapper* _tmp37_ = NULL;
@@ -10024,7 +10015,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_tmp36_ = _tmp42_;
 #line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10022 "ImportPage.c"
+#line 10013 "ImportPage.c"
 						goto __catch65_g_error;
 					}
 #line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10037,7 +10028,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					metadata = _tmp43_;
 #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (_tmp36_);
-#line 10035 "ImportPage.c"
+#line 10026 "ImportPage.c"
 				}
 				goto __finally65;
 				__catch65_g_error:
@@ -10063,7 +10054,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					g_warning ("ImportPage.vala:1526: Unable to fetch metadata for %s/%s: %s", _tmp44_, _tmp45_, _tmp47_);
 #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 10061 "ImportPage.c"
+#line 10052 "ImportPage.c"
 				}
 				__finally65:
 #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10086,7 +10077,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					g_clear_error (&_inner_error_);
 #line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return;
-#line 10084 "ImportPage.c"
+#line 10075 "ImportPage.c"
 				}
 			}
 #line 1532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10095,7 +10086,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			_tmp48_ = metadata;
 #line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp48_ != NULL) {
-#line 10093 "ImportPage.c"
+#line 10084 "ImportPage.c"
 				guint8* flattened_sans_thumbnail = NULL;
 				PhotoMetadata* _tmp49_ = NULL;
 				gint _tmp50_ = 0;
@@ -10121,7 +10112,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp53__length1 = flattened_sans_thumbnail_length1;
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp53_ != NULL) {
-#line 10119 "ImportPage.c"
+#line 10110 "ImportPage.c"
 					guint8* _tmp54_ = NULL;
 					gint _tmp54__length1 = 0;
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10130,15 +10121,15 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_tmp54__length1 = flattened_sans_thumbnail_length1;
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp52_ = _tmp54__length1 > 0;
-#line 10128 "ImportPage.c"
+#line 10119 "ImportPage.c"
 				} else {
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp52_ = FALSE;
-#line 10132 "ImportPage.c"
+#line 10123 "ImportPage.c"
 				}
 #line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp52_) {
-#line 10136 "ImportPage.c"
+#line 10127 "ImportPage.c"
 					guint8* _tmp55_ = NULL;
 					gint _tmp55__length1 = 0;
 					guint8* _tmp56_ = NULL;
@@ -10158,11 +10149,11 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_free0 (exif_only_md5);
 #line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					exif_only_md5 = _tmp57_;
-#line 10156 "ImportPage.c"
+#line 10147 "ImportPage.c"
 				}
 #line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 10160 "ImportPage.c"
+#line 10151 "ImportPage.c"
 			}
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_raw = NULL;
@@ -10174,7 +10165,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			preview_raw_length = (gsize) 0;
 #line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview = NULL;
-#line 10172 "ImportPage.c"
+#line 10163 "ImportPage.c"
 			{
 				gchar* preview_fulldir = NULL;
 				const gchar* _tmp58_ = NULL;
@@ -10210,7 +10201,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp62_ = associated;
 #line 1551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp62_ != NULL) {
-#line 10208 "ImportPage.c"
+#line 10199 "ImportPage.c"
 					PhotoImportSource* _tmp63_ = NULL;
 					gchar* _tmp64_ = NULL;
 					PhotoImportSource* _tmp65_ = NULL;
@@ -10231,7 +10222,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_free0 (preview_filename);
 #line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					preview_filename = _tmp66_;
-#line 10229 "ImportPage.c"
+#line 10220 "ImportPage.c"
 				}
 #line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp68_ = import_page_spin_idle_context;
@@ -10263,7 +10254,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_free0 (preview_filename);
 #line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_fulldir);
-#line 10261 "ImportPage.c"
+#line 10252 "ImportPage.c"
 					goto __catch66_g_error;
 				}
 #line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10280,7 +10271,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_free0 (preview_filename);
 #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (preview_fulldir);
-#line 10278 "ImportPage.c"
+#line 10269 "ImportPage.c"
 			}
 			goto __finally66;
 			__catch66_g_error:
@@ -10298,7 +10289,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp79_ = video_reader_is_supported_video_filename (_tmp78_);
 #line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp79_) {
-#line 10296 "ImportPage.c"
+#line 10287 "ImportPage.c"
 					const gchar* _tmp80_ = NULL;
 					const gchar* _tmp81_ = NULL;
 					GError* _tmp82_ = NULL;
@@ -10313,11 +10304,11 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_tmp83_ = _tmp82_->message;
 #line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_warning ("ImportPage.vala:1564: Unable to fetch preview for %s/%s: %s", _tmp80_, _tmp81_, _tmp83_);
-#line 10311 "ImportPage.c"
+#line 10302 "ImportPage.c"
 				}
 #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_error_free0 (err);
-#line 10315 "ImportPage.c"
+#line 10306 "ImportPage.c"
 			}
 			__finally66:
 #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10346,7 +10337,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				g_clear_error (&_inner_error_);
 #line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return;
-#line 10344 "ImportPage.c"
+#line 10335 "ImportPage.c"
 			}
 #line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_md5 = NULL;
@@ -10354,7 +10345,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			_tmp86_ = preview;
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp86_ != NULL) {
-#line 10352 "ImportPage.c"
+#line 10343 "ImportPage.c"
 				guint8* _tmp87_ = NULL;
 				gint _tmp87__length1 = 0;
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10363,29 +10354,29 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp87__length1 = preview_raw_length1;
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp85_ = _tmp87_ != NULL;
-#line 10361 "ImportPage.c"
+#line 10352 "ImportPage.c"
 			} else {
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp85_ = FALSE;
-#line 10365 "ImportPage.c"
+#line 10356 "ImportPage.c"
 			}
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp85_) {
-#line 10369 "ImportPage.c"
+#line 10360 "ImportPage.c"
 				gsize _tmp88_ = 0UL;
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp88_ = preview_raw_length;
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp84_ = _tmp88_ > ((gsize) 0);
-#line 10375 "ImportPage.c"
+#line 10366 "ImportPage.c"
 			} else {
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp84_ = FALSE;
-#line 10379 "ImportPage.c"
+#line 10370 "ImportPage.c"
 			}
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp84_) {
-#line 10383 "ImportPage.c"
+#line 10374 "ImportPage.c"
 				guint8* _tmp89_ = NULL;
 				gint _tmp89__length1 = 0;
 				gsize _tmp90_ = 0UL;
@@ -10402,13 +10393,13 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_free0 (preview_md5);
 #line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_md5 = _tmp91_;
-#line 10400 "ImportPage.c"
+#line 10391 "ImportPage.c"
 			}
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp92_ = import_source;
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 10406 "ImportPage.c"
+#line 10397 "ImportPage.c"
 				ImportSource* _tmp93_ = NULL;
 				GdkPixbuf* _tmp94_ = NULL;
 #line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10417,13 +10408,13 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp94_ = preview;
 #line 1578 "/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 10415 "ImportPage.c"
+#line 10406 "ImportPage.c"
 			}
 #line 1580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp95_ = import_source;
 #line 1580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp95_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10421 "ImportPage.c"
+#line 10412 "ImportPage.c"
 				ImportSource* _tmp96_ = NULL;
 				GdkPixbuf* _tmp97_ = NULL;
 				const gchar* _tmp98_ = NULL;
@@ -10441,13 +10432,13 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp100_ = exif_only_md5;
 #line 1581 "/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 10439 "ImportPage.c"
+#line 10430 "ImportPage.c"
 			}
 #line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp101_ = associated;
 #line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp101_ != NULL) {
-#line 10445 "ImportPage.c"
+#line 10436 "ImportPage.c"
 				{
 					PhotoMetadata* associated_metadata = NULL;
 					GPSpinIdleWrapper* _tmp102_ = NULL;
@@ -10495,7 +10486,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					associated_metadata = _tmp112_;
 #line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10493 "ImportPage.c"
+#line 10484 "ImportPage.c"
 						goto __catch67_g_error;
 					}
 #line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10510,7 +10501,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					photo_import_source_update (_tmp113_, _tmp114_, _tmp115_, _tmp116_, NULL);
 #line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (associated_metadata);
-#line 10508 "ImportPage.c"
+#line 10499 "ImportPage.c"
 				}
 				goto __finally67;
 				__catch67_g_error:
@@ -10552,7 +10543,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_free0 (_tmp119_);
 #line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 10550 "ImportPage.c"
+#line 10541 "ImportPage.c"
 				}
 				__finally67:
 #line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10583,7 +10574,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					g_clear_error (&_inner_error_);
 #line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return;
-#line 10581 "ImportPage.c"
+#line 10572 "ImportPage.c"
 				}
 			}
 #line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10628,11 +10619,11 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			_g_free0 (filename);
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_source);
-#line 10626 "ImportPage.c"
+#line 10617 "ImportPage.c"
 		}
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_import_source_list);
-#line 10630 "ImportPage.c"
+#line 10621 "ImportPage.c"
 	}
 }
 
@@ -10652,7 +10643,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 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 10650 "ImportPage.c"
+#line 10641 "ImportPage.c"
 		ViewCollection* _tmp2_ = NULL;
 		ViewCollection* _tmp3_ = NULL;
 		ImportPageHideImportedViewFilter* _tmp4_ = NULL;
@@ -10666,7 +10657,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 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 10664 "ImportPage.c"
+#line 10655 "ImportPage.c"
 	} else {
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
@@ -10681,7 +10672,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 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 10679 "ImportPage.c"
+#line 10670 "ImportPage.c"
 	}
 #line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = config_facade_get_instance ();
@@ -10695,7 +10686,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 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 10693 "ImportPage.c"
+#line 10684 "ImportPage.c"
 }
 
 
@@ -10720,7 +10711,7 @@ static void import_page_on_import_selected (ImportPage* self) {
 	_g_object_unref0 (_tmp3_);
 #line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 10718 "ImportPage.c"
+#line 10709 "ImportPage.c"
 }
 
 
@@ -10745,7 +10736,7 @@ static void import_page_on_import_all (ImportPage* self) {
 	_g_object_unref0 (_tmp3_);
 #line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 10743 "ImportPage.c"
+#line 10734 "ImportPage.c"
 }
 
 
@@ -10754,28 +10745,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 1639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 10752 "ImportPage.c"
+#line 10743 "ImportPage.c"
 }
 
 
 static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
 #line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import_reporter ((ImportPage*) self, manifest);
-#line 10759 "ImportPage.c"
+#line 10750 "ImportPage.c"
 }
 
 
 static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, BatchImportResult* _result_, gpointer self) {
 #line 1677 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_import_job_failed ((ImportPage*) self, _result_);
-#line 10766 "ImportPage.c"
+#line 10757 "ImportPage.c"
 }
 
 
 static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
 #line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_close_import ((ImportPage*) self);
-#line 10773 "ImportPage.c"
+#line 10764 "ImportPage.c"
 }
 
 
@@ -10817,7 +10808,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 	_tmp4_ = res;
 #line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ != GP_OK) {
-#line 10815 "ImportPage.c"
+#line 10806 "ImportPage.c"
 		const gchar* _tmp5_ = NULL;
 		int _tmp6_ = 0;
 		gchar* _tmp7_ = NULL;
@@ -10844,7 +10835,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 		_g_free0 (_tmp8_);
 #line 1631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 10842 "ImportPage.c"
+#line 10833 "ImportPage.c"
 	}
 #line 1634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = self->priv->refreshed;
@@ -10864,7 +10855,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 	_tmp14_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL);
 #line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	already_imported = _tmp14_;
-#line 10862 "ImportPage.c"
+#line 10853 "ImportPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeIterable* _tmp15_ = NULL;
@@ -10877,7 +10868,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 		_object_it = _tmp16_;
 #line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 10875 "ImportPage.c"
+#line 10866 "ImportPage.c"
 			GeeIterator* _tmp17_ = NULL;
 			gboolean _tmp18_ = FALSE;
 			DataObject* object = NULL;
@@ -10907,7 +10898,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 			if (!_tmp18_) {
 #line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 10905 "ImportPage.c"
+#line 10896 "ImportPage.c"
 			}
 #line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp19_ = _object_it;
@@ -10933,7 +10924,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 			_tmp26_ = import_preview_is_already_imported (_tmp25_);
 #line 1646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp26_) {
-#line 10931 "ImportPage.c"
+#line 10922 "ImportPage.c"
 				ImportSource* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
 				gchar* _tmp29_ = NULL;
@@ -10986,7 +10977,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 				_g_object_unref0 (object);
 #line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				continue;
-#line 10983 "ImportPage.c"
+#line 10974 "ImportPage.c"
 			}
 #line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp38_ = import_page_null_context;
@@ -11000,7 +10991,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 			_tmp42_ = import_file;
 #line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10997 "ImportPage.c"
+#line 10988 "ImportPage.c"
 				ImportSource* _tmp43_ = NULL;
 				PhotoImportSource* _tmp44_ = NULL;
 				PhotoImportSource* _tmp45_ = NULL;
@@ -11014,15 +11005,15 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 				_tmp41_ = _tmp45_ != NULL;
 #line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp45_);
-#line 11011 "ImportPage.c"
+#line 11002 "ImportPage.c"
 			} else {
 #line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp41_ = FALSE;
-#line 11015 "ImportPage.c"
+#line 11006 "ImportPage.c"
 			}
 #line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp41_) {
-#line 11019 "ImportPage.c"
+#line 11010 "ImportPage.c"
 				ImportPageCameraImportJob* _tmp46_ = NULL;
 				GPContextWrapper* _tmp47_ = NULL;
 				ImportSource* _tmp48_ = NULL;
@@ -11050,7 +11041,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 				_batch_import_job_unref0 (_tmp52_);
 #line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp50_);
-#line 11047 "ImportPage.c"
+#line 11038 "ImportPage.c"
 			}
 #line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp53_ = jobs;
@@ -11066,11 +11057,11 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 			_g_object_unref0 (preview);
 #line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (object);
-#line 11063 "ImportPage.c"
+#line 11054 "ImportPage.c"
 		}
 #line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_object_it);
-#line 11067 "ImportPage.c"
+#line 11058 "ImportPage.c"
 	}
 #line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp55_ = jobs;
@@ -11090,7 +11081,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 	_tmp61_ = _tmp60_;
 #line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp61_ > 0) {
-#line 11087 "ImportPage.c"
+#line 11078 "ImportPage.c"
 		ImportPage* _tmp62_ = NULL;
 		ImportPage* _tmp63_ = NULL;
 		BatchImport* batch_import = NULL;
@@ -11153,7 +11144,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 		_g_object_unref0 (_tmp74_);
 #line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (batch_import);
-#line 11150 "ImportPage.c"
+#line 11141 "ImportPage.c"
 	} else {
 		GeeArrayList* _tmp75_ = NULL;
 		gint _tmp76_ = 0;
@@ -11166,7 +11157,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 		_tmp77_ = _tmp76_;
 #line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp77_ > 0) {
-#line 11163 "ImportPage.c"
+#line 11154 "ImportPage.c"
 			GeeArrayList* _tmp78_ = NULL;
 			ImportManifest* _tmp79_ = NULL;
 			ImportManifest* _tmp80_ = NULL;
@@ -11180,17 +11171,17 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 			import_page_import_reporter (self, _tmp80_);
 #line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_import_manifest_unref0 (_tmp80_);
-#line 11177 "ImportPage.c"
+#line 11168 "ImportPage.c"
 		}
 #line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_close_import (self);
-#line 11181 "ImportPage.c"
+#line 11172 "ImportPage.c"
 	}
 #line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (already_imported);
 #line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (jobs);
-#line 11187 "ImportPage.c"
+#line 11178 "ImportPage.c"
 }
 
 
@@ -11211,7 +11202,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 	if (_tmp2_ == NULL) {
 #line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = TRUE;
-#line 11208 "ImportPage.c"
+#line 11199 "ImportPage.c"
 	} else {
 		BatchImportResult* _tmp3_ = NULL;
 		ImportResult _tmp4_ = 0;
@@ -11221,13 +11212,13 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		_tmp4_ = _tmp3_->result;
 #line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp4_ == IMPORT_RESULT_SUCCESS;
-#line 11218 "ImportPage.c"
+#line 11209 "ImportPage.c"
 	}
 #line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
 #line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11224 "ImportPage.c"
+#line 11215 "ImportPage.c"
 	}
 	{
 		BatchImportResult* _tmp5_ = NULL;
@@ -11240,7 +11231,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		g_file_delete (_tmp6_, NULL, &_inner_error_);
 #line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11237 "ImportPage.c"
+#line 11228 "ImportPage.c"
 			goto __catch68_g_error;
 		}
 	}
@@ -11276,7 +11267,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		_g_free0 (_tmp10_);
 #line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 11273 "ImportPage.c"
+#line 11264 "ImportPage.c"
 	}
 	__finally68:
 #line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11287,7 +11278,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		g_clear_error (&_inner_error_);
 #line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11284 "ImportPage.c"
+#line 11275 "ImportPage.c"
 	}
 }
 
@@ -11295,7 +11286,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 static gpointer _batch_import_job_ref0 (gpointer self) {
 #line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? batch_import_job_ref (self) : NULL;
-#line 11292 "ImportPage.c"
+#line 11283 "ImportPage.c"
 }
 
 
@@ -11304,7 +11295,7 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
 #line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 11301 "ImportPage.c"
+#line 11292 "ImportPage.c"
 }
 
 
@@ -11358,7 +11349,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 	_tmp5_ = _tmp4_;
 #line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ > 0) {
-#line 11355 "ImportPage.c"
+#line 11346 "ImportPage.c"
 		gchar* photos_string = NULL;
 		ImportManifest* _tmp6_ = NULL;
 		GeeList* _tmp7_ = NULL;
@@ -11554,7 +11545,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 			_g_object_unref0 (local_ref);
 #line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return;
-#line 11551 "ImportPage.c"
+#line 11542 "ImportPage.c"
 		}
 #line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_ui_question_params_unref0 (question);
@@ -11568,7 +11559,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		_g_free0 (videos_string);
 #line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (photos_string);
-#line 11565 "ImportPage.c"
+#line 11556 "ImportPage.c"
 	} else {
 		ImportManifest* _tmp59_ = NULL;
 #line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11579,7 +11570,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		_g_object_unref0 (local_ref);
 #line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11576 "ImportPage.c"
+#line 11567 "ImportPage.c"
 	}
 #line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp60_ = self->priv->import_sources;
@@ -11587,7 +11578,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 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	marker = _tmp61_;
-#line 11584 "ImportPage.c"
+#line 11575 "ImportPage.c"
 	{
 		GeeList* _batch_result_list = NULL;
 		ImportManifest* _tmp62_ = NULL;
@@ -11618,7 +11609,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		_batch_result_index = -1;
 #line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 11615 "ImportPage.c"
+#line 11606 "ImportPage.c"
 			gint _tmp68_ = 0;
 			gint _tmp69_ = 0;
 			gint _tmp70_ = 0;
@@ -11646,7 +11637,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 			if (!(_tmp69_ < _tmp70_)) {
 #line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 11643 "ImportPage.c"
+#line 11634 "ImportPage.c"
 			}
 #line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp71_ = _batch_result_list;
@@ -11680,11 +11671,11 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 			_batch_import_job_unref0 (job);
 #line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_result_unref0 (batch_result);
-#line 11677 "ImportPage.c"
+#line 11668 "ImportPage.c"
 		}
 #line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_batch_result_list);
-#line 11681 "ImportPage.c"
+#line 11672 "ImportPage.c"
 	}
 #line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp81_ = app_window_get_instance ();
@@ -11722,7 +11713,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 	_tmp92_ = error_count;
 #line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp92_ > 0) {
-#line 11719 "ImportPage.c"
+#line 11710 "ImportPage.c"
 		gchar* error_string = NULL;
 		gint _tmp93_ = 0;
 		const gchar* _tmp94_ = NULL;
@@ -11745,7 +11736,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		app_window_error_message (_tmp97_, NULL);
 #line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (error_string);
-#line 11742 "ImportPage.c"
+#line 11733 "ImportPage.c"
 	}
 #line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp98_ = progress;
@@ -11761,7 +11752,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 	_g_object_unref0 (marker);
 #line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (local_ref);
-#line 11758 "ImportPage.c"
+#line 11749 "ImportPage.c"
 }
 
 
@@ -11789,7 +11780,7 @@ static void import_page_close_import (ImportPage* self) {
 	_tmp4_ = res;
 #line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ != GP_OK) {
-#line 11786 "ImportPage.c"
+#line 11777 "ImportPage.c"
 		int _tmp5_ = 0;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -11803,7 +11794,7 @@ static void import_page_close_import (ImportPage* self) {
 		g_message ("ImportPage.vala:1770: Unable to unlock camera: %s", _tmp7_);
 #line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp7_);
-#line 11800 "ImportPage.c"
+#line 11791 "ImportPage.c"
 	}
 #line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = self->priv->refreshed;
@@ -11811,7 +11802,7 @@ static void import_page_close_import (ImportPage* self) {
 	import_page_update_status (self, FALSE, _tmp8_);
 #line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 11808 "ImportPage.c"
+#line 11799 "ImportPage.c"
 }
 
 
@@ -11829,14 +11820,14 @@ static void import_page_real_set_display_titles (CheckerboardPage* base, gboolea
 	_tmp1_ = display;
 #line 1781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
-#line 11826 "ImportPage.c"
+#line 11817 "ImportPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 11833 "ImportPage.c"
+#line 11824 "ImportPage.c"
 }
 
 
@@ -11855,7 +11846,7 @@ static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPa
 	result = _tmp1_;
 #line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 11852 "ImportPage.c"
+#line 11843 "ImportPage.c"
 }
 
 
@@ -11877,14 +11868,14 @@ static ImportPageImportViewManager* import_page_import_view_manager_construct (G
 	self->priv->owner = _tmp1_;
 #line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 11874 "ImportPage.c"
+#line 11865 "ImportPage.c"
 }
 
 
 static ImportPageImportViewManager* import_page_import_view_manager_new (ImportPage* owner) {
 #line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_import_view_manager_construct (IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, owner);
-#line 11881 "ImportPage.c"
+#line 11872 "ImportPage.c"
 }
 
 
@@ -11905,7 +11896,7 @@ static DataView* import_page_import_view_manager_real_create_view (ViewManager*
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 11902 "ImportPage.c"
+#line 11893 "ImportPage.c"
 }
 
 
@@ -11918,14 +11909,14 @@ static void import_page_import_view_manager_class_init (ImportPageImportViewMana
 	g_type_class_add_private (klass, sizeof (ImportPageImportViewManagerPrivate));
 #line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((ViewManagerClass *) klass)->create_view = import_page_import_view_manager_real_create_view;
-#line 11915 "ImportPage.c"
+#line 11906 "ImportPage.c"
 }
 
 
 static void import_page_import_view_manager_instance_init (ImportPageImportViewManager * self) {
 #line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv = IMPORT_PAGE_IMPORT_VIEW_MANAGER_GET_PRIVATE (self);
-#line 11922 "ImportPage.c"
+#line 11913 "ImportPage.c"
 }
 
 
@@ -11937,7 +11928,7 @@ static void import_page_import_view_manager_finalize (ViewManager* obj) {
 	_g_object_unref0 (self->priv->owner);
 #line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	VIEW_MANAGER_CLASS (import_page_import_view_manager_parent_class)->finalize (obj);
-#line 11934 "ImportPage.c"
+#line 11925 "ImportPage.c"
 }
 
 
@@ -11956,7 +11947,7 @@ static GType import_page_import_view_manager_get_type (void) {
 static gpointer _gp_context_wrapper_ref0 (gpointer self) {
 #line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? gp_context_wrapper_ref (self) : NULL;
-#line 11953 "ImportPage.c"
+#line 11944 "ImportPage.c"
 }
 
 
@@ -12052,7 +12043,7 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
 	_tmp16_ = import_file;
 #line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 12049 "ImportPage.c"
+#line 12040 "ImportPage.c"
 		ImportSource* _tmp17_ = NULL;
 		PhotoMetadata* _tmp18_ = NULL;
 #line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12063,13 +12054,13 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
 		_media_metadata_unref0 (_tmp15_);
 #line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = _tmp18_;
-#line 12060 "ImportPage.c"
+#line 12051 "ImportPage.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_media_metadata_unref0 (_tmp15_);
 #line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = NULL;
-#line 12066 "ImportPage.c"
+#line 12057 "ImportPage.c"
 	}
 #line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp19_ = _media_metadata_ref0 (_tmp15_);
@@ -12087,14 +12078,14 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
 	_media_metadata_unref0 (_tmp15_);
 #line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 12084 "ImportPage.c"
+#line 12075 "ImportPage.c"
 }
 
 
 static ImportPageCameraImportJob* import_page_camera_import_job_new (GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file) {
 #line 485 "/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 12091 "ImportPage.c"
+#line 12082 "ImportPage.c"
 }
 
 
@@ -12109,7 +12100,7 @@ static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraI
 	result = _tmp0_;
 #line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12106 "ImportPage.c"
+#line 12097 "ImportPage.c"
 }
 
 
@@ -12128,7 +12119,7 @@ static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (B
 	result = _tmp1_;
 #line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12125 "ImportPage.c"
+#line 12116 "ImportPage.c"
 }
 
 
@@ -12143,23 +12134,23 @@ static time_t import_page_camera_import_job_real_get_exposure_time_override (Bat
 	_tmp1_ = self->priv->import_file;
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 12140 "ImportPage.c"
+#line 12131 "ImportPage.c"
 		time_t _tmp2_ = 0;
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = import_page_camera_import_job_get_exposure_time (self);
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp2_;
-#line 12146 "ImportPage.c"
+#line 12137 "ImportPage.c"
 	} else {
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = (time_t) 0;
-#line 12150 "ImportPage.c"
+#line 12141 "ImportPage.c"
 	}
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12156 "ImportPage.c"
+#line 12147 "ImportPage.c"
 }
 
 
@@ -12178,7 +12169,7 @@ static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImpor
 	result = _tmp1_;
 #line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12175 "ImportPage.c"
+#line 12166 "ImportPage.c"
 }
 
 
@@ -12197,7 +12188,7 @@ static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImp
 	result = _tmp1_;
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12194 "ImportPage.c"
+#line 12185 "ImportPage.c"
 }
 
 
@@ -12216,7 +12207,7 @@ static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* b
 	result = _tmp1_;
 #line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12213 "ImportPage.c"
+#line 12204 "ImportPage.c"
 }
 
 
@@ -12235,7 +12226,7 @@ static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base)
 	result = _tmp1_;
 #line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12232 "ImportPage.c"
+#line 12223 "ImportPage.c"
 }
 
 
@@ -12255,7 +12246,7 @@ static void import_page_camera_import_job_real_set_associated (BatchImportJob* b
 	_batch_import_job_unref0 (self->priv->associated);
 #line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated = _tmp1_;
-#line 12252 "ImportPage.c"
+#line 12243 "ImportPage.c"
 }
 
 
@@ -12273,7 +12264,7 @@ static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraI
 	result = _tmp1_;
 #line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12270 "ImportPage.c"
+#line 12261 "ImportPage.c"
 }
 
 
@@ -12286,7 +12277,7 @@ static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob*
 	result = FALSE;
 #line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12283 "ImportPage.c"
+#line 12274 "ImportPage.c"
 }
 
 
@@ -12312,21 +12303,21 @@ static gboolean import_page_camera_import_job_real_determine_file_size (BatchImp
 	if (filesize) {
 #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*filesize = _vala_filesize;
-#line 12309 "ImportPage.c"
+#line 12300 "ImportPage.c"
 	}
 #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (file) {
 #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*file = _vala_file;
-#line 12315 "ImportPage.c"
+#line 12306 "ImportPage.c"
 	} else {
 #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_vala_file);
-#line 12319 "ImportPage.c"
+#line 12310 "ImportPage.c"
 	}
 #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12323 "ImportPage.c"
+#line 12314 "ImportPage.c"
 }
 
 
@@ -12352,7 +12343,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 	_vala_copy_to_library = FALSE;
 #line 554 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	dest_file = NULL;
-#line 12349 "ImportPage.c"
+#line 12340 "ImportPage.c"
 	{
 		gboolean collision = FALSE;
 		GFile* _tmp0_ = NULL;
@@ -12376,7 +12367,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_tmp0_ = _tmp5_;
 #line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12373 "ImportPage.c"
+#line 12364 "ImportPage.c"
 			goto __catch69_g_error;
 		}
 #line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12389,7 +12380,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		dest_file = _tmp6_;
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 12386 "ImportPage.c"
+#line 12377 "ImportPage.c"
 	}
 	goto __finally69;
 	__catch69_g_error:
@@ -12420,7 +12411,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_free0 (_tmp9_);
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 12417 "ImportPage.c"
+#line 12408 "ImportPage.c"
 	}
 	__finally69:
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12431,13 +12422,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_object_unref0 (dest_file);
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return FALSE;
-#line 12428 "ImportPage.c"
+#line 12419 "ImportPage.c"
 	}
 #line 564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = dest_file;
 #line 564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp12_ == NULL) {
-#line 12434 "ImportPage.c"
+#line 12425 "ImportPage.c"
 		ImportSource* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
@@ -12459,27 +12450,27 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		if (file_to_import) {
 #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			*file_to_import = _vala_file_to_import;
-#line 12456 "ImportPage.c"
+#line 12447 "ImportPage.c"
 		} else {
 #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (_vala_file_to_import);
-#line 12460 "ImportPage.c"
+#line 12451 "ImportPage.c"
 		}
 #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (copy_to_library) {
 #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			*copy_to_library = _vala_copy_to_library;
-#line 12466 "ImportPage.c"
+#line 12457 "ImportPage.c"
 		}
 #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 12470 "ImportPage.c"
+#line 12461 "ImportPage.c"
 	}
 #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp16_ = dest_file;
 #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	library_monitor_blacklist_file (_tmp16_, "CameraImportJob.prepare");
-#line 12476 "ImportPage.c"
+#line 12467 "ImportPage.c"
 	{
 		GPContextWrapper* _tmp17_ = NULL;
 		GPContext* _tmp18_ = NULL;
@@ -12503,7 +12494,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		gp_save_image (_tmp18_, _tmp19_, _tmp20_, _tmp21_, _tmp22_, &_inner_error_);
 #line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12500 "ImportPage.c"
+#line 12491 "ImportPage.c"
 			goto __finally70;
 		}
 	}
@@ -12514,7 +12505,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_tmp23_ = dest_file;
 #line 576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_monitor_unblacklist_file (_tmp23_);
-#line 12511 "ImportPage.c"
+#line 12502 "ImportPage.c"
 	}
 #line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -12524,13 +12515,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_object_unref0 (dest_file);
 #line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return FALSE;
-#line 12521 "ImportPage.c"
+#line 12512 "ImportPage.c"
 	}
 #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp24_ = self->priv->associated;
 #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp24_ != NULL) {
-#line 12527 "ImportPage.c"
+#line 12518 "ImportPage.c"
 		BackingPhotoRow* _tmp39_ = NULL;
 		GFile* assoc_dest = NULL;
 		BackingPhotoRow* _tmp42_ = NULL;
@@ -12572,7 +12563,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_tmp25_ = _tmp33_;
 #line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12569 "ImportPage.c"
+#line 12560 "ImportPage.c"
 				goto __catch71_g_error;
 			}
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12585,7 +12576,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			self->priv->associated_file = _tmp34_;
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_backing_photo_row_unref0 (_tmp25_);
-#line 12582 "ImportPage.c"
+#line 12573 "ImportPage.c"
 		}
 		goto __finally71;
 		__catch71_g_error:
@@ -12612,7 +12603,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 ": %s", _tmp36_, _tmp38_);
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_error_free0 (err);
-#line 12608 "ImportPage.c"
+#line 12599 "ImportPage.c"
 		}
 		__finally71:
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12623,13 +12614,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_g_object_unref0 (dest_file);
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return FALSE;
-#line 12619 "ImportPage.c"
+#line 12610 "ImportPage.c"
 		}
 #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp39_ = self->priv->associated_file;
 #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp39_ == NULL) {
-#line 12625 "ImportPage.c"
+#line 12616 "ImportPage.c"
 			ImportPageCameraImportJob* _tmp40_ = NULL;
 			const gchar* _tmp41_ = NULL;
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12646,21 +12637,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			if (file_to_import) {
 #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				*file_to_import = _vala_file_to_import;
-#line 12642 "ImportPage.c"
+#line 12633 "ImportPage.c"
 			} else {
 #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_vala_file_to_import);
-#line 12646 "ImportPage.c"
+#line 12637 "ImportPage.c"
 			}
 #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (copy_to_library) {
 #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				*copy_to_library = _vala_copy_to_library;
-#line 12652 "ImportPage.c"
+#line 12643 "ImportPage.c"
 			}
 #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 12656 "ImportPage.c"
+#line 12647 "ImportPage.c"
 		}
 #line 595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp42_ = self->priv->associated_file;
@@ -12674,7 +12665,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_tmp45_ = assoc_dest;
 #line 596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_monitor_blacklist_file (_tmp45_, "CameraImportJob.prepare");
-#line 12670 "ImportPage.c"
+#line 12661 "ImportPage.c"
 		{
 			GPContextWrapper* _tmp46_ = NULL;
 			GPContext* _tmp47_ = NULL;
@@ -12704,7 +12695,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			gp_save_image (_tmp47_, _tmp48_, _tmp50_, _tmp52_, _tmp53_, &_inner_error_);
 #line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12700 "ImportPage.c"
+#line 12691 "ImportPage.c"
 				goto __finally72;
 			}
 		}
@@ -12715,7 +12706,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_tmp54_ = assoc_dest;
 #line 601 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			library_monitor_unblacklist_file (_tmp54_);
-#line 12711 "ImportPage.c"
+#line 12702 "ImportPage.c"
 		}
 #line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -12727,11 +12718,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_g_object_unref0 (dest_file);
 #line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return FALSE;
-#line 12723 "ImportPage.c"
+#line 12714 "ImportPage.c"
 		}
 #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (assoc_dest);
-#line 12727 "ImportPage.c"
+#line 12718 "ImportPage.c"
 	}
 #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp55_ = dest_file;
@@ -12751,21 +12742,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 	if (file_to_import) {
 #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*file_to_import = _vala_file_to_import;
-#line 12747 "ImportPage.c"
+#line 12738 "ImportPage.c"
 	} else {
 #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_vala_file_to_import);
-#line 12751 "ImportPage.c"
+#line 12742 "ImportPage.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (copy_to_library) {
 #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*copy_to_library = _vala_copy_to_library;
-#line 12757 "ImportPage.c"
+#line 12748 "ImportPage.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12761 "ImportPage.c"
+#line 12752 "ImportPage.c"
 }
 
 
@@ -12787,7 +12778,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 	_tmp0_ = source;
 #line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO)) {
-#line 12783 "ImportPage.c"
+#line 12774 "ImportPage.c"
 		Photo* photo = NULL;
 		MediaSource* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
@@ -12802,7 +12793,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 		_tmp3_ = self->priv->associated_file;
 #line 617 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp3_ != NULL) {
-#line 12798 "ImportPage.c"
+#line 12789 "ImportPage.c"
 			Photo* _tmp4_ = NULL;
 			BackingPhotoRow* _tmp5_ = NULL;
 			Photo* _tmp6_ = NULL;
@@ -12823,7 +12814,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 				_g_object_unref0 (photo);
 #line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return FALSE;
-#line 12819 "ImportPage.c"
+#line 12810 "ImportPage.c"
 			}
 #line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			ret = TRUE;
@@ -12839,17 +12830,17 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 			photo_set_raw_developer (_tmp6_, _tmp9_);
 #line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (_tmp8_);
-#line 12835 "ImportPage.c"
+#line 12826 "ImportPage.c"
 		}
 #line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (photo);
-#line 12839 "ImportPage.c"
+#line 12830 "ImportPage.c"
 	}
 #line 623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = ret;
 #line 623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12845 "ImportPage.c"
+#line 12836 "ImportPage.c"
 }
 
 
@@ -12882,7 +12873,7 @@ static void import_page_camera_import_job_class_init (ImportPageCameraImportJobC
 	((BatchImportJobClass *) klass)->prepare = import_page_camera_import_job_real_prepare;
 #line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->complete = import_page_camera_import_job_real_complete;
-#line 12878 "ImportPage.c"
+#line 12869 "ImportPage.c"
 }
 
 
@@ -12893,7 +12884,7 @@ static void import_page_camera_import_job_instance_init (ImportPageCameraImportJ
 	self->priv->associated = NULL;
 #line 482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated_file = NULL;
-#line 12889 "ImportPage.c"
+#line 12880 "ImportPage.c"
 }
 
 
@@ -12921,7 +12912,7 @@ static void import_page_camera_import_job_finalize (BatchImportJob* obj) {
 	_g_object_unref0 (self->priv->duplicated_file);
 #line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	BATCH_IMPORT_JOB_CLASS (import_page_camera_import_job_parent_class)->finalize (obj);
-#line 12917 "ImportPage.c"
+#line 12908 "ImportPage.c"
 }
 
 
@@ -12946,7 +12937,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 629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12942 "ImportPage.c"
+#line 12933 "ImportPage.c"
 }
 
 
@@ -12954,19 +12945,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 12962 "ImportPage.c"
+#line 12953 "ImportPage.c"
 }
 
 
@@ -12993,27 +12984,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 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((gboolean) (SEARCH_FILTER_CRITERIA_MEDIA & _tmp3_)) {
-#line 12989 "ImportPage.c"
+#line 12980 "ImportPage.c"
 		gboolean _tmp4_ = FALSE;
 #line 636 "/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 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = _tmp4_;
-#line 12995 "ImportPage.c"
+#line 12986 "ImportPage.c"
 	} else {
 #line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = FALSE;
-#line 12999 "ImportPage.c"
+#line 12990 "ImportPage.c"
 	}
 #line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_) {
-#line 13003 "ImportPage.c"
+#line 12994 "ImportPage.c"
 		ImportSource* _tmp5_ = NULL;
 #line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = source;
 #line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 13009 "ImportPage.c"
+#line 13000 "ImportPage.c"
 			gboolean _tmp6_ = FALSE;
 			gboolean _tmp7_ = FALSE;
 #line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13028,7 +13019,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 				_g_object_unref0 (source);
 #line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return result;
-#line 13024 "ImportPage.c"
+#line 13015 "ImportPage.c"
 			}
 		} else {
 			ImportSource* _tmp8_ = NULL;
@@ -13036,7 +13027,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 			_tmp8_ = source;
 #line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 13032 "ImportPage.c"
+#line 13023 "ImportPage.c"
 				PhotoImportSource* photo = NULL;
 				ImportSource* _tmp9_ = NULL;
 				PhotoImportSource* _tmp10_ = NULL;
@@ -13054,7 +13045,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 				_tmp12_ = photo_import_source_get_file_format (_tmp11_);
 #line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp12_ == PHOTO_FILE_FORMAT_RAW) {
-#line 13050 "ImportPage.c"
+#line 13041 "ImportPage.c"
 					PhotoImportSource* _tmp13_ = NULL;
 					PhotoImportSource* _tmp14_ = NULL;
 					PhotoImportSource* _tmp15_ = NULL;
@@ -13071,7 +13062,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 					_g_object_unref0 (_tmp15_);
 #line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp16_) {
-#line 13067 "ImportPage.c"
+#line 13058 "ImportPage.c"
 						gboolean _tmp17_ = FALSE;
 						gboolean _tmp18_ = FALSE;
 						gboolean _tmp19_ = FALSE;
@@ -13081,7 +13072,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 						_tmp19_ = _tmp18_;
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp19_) {
-#line 13077 "ImportPage.c"
+#line 13068 "ImportPage.c"
 							gboolean _tmp20_ = FALSE;
 							gboolean _tmp21_ = FALSE;
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13090,11 +13081,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 							_tmp21_ = _tmp20_;
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp17_ = !_tmp21_;
-#line 13086 "ImportPage.c"
+#line 13077 "ImportPage.c"
 						} else {
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp17_ = FALSE;
-#line 13090 "ImportPage.c"
+#line 13081 "ImportPage.c"
 						}
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (_tmp17_) {
@@ -13106,7 +13097,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 							_g_object_unref0 (source);
 #line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							return result;
-#line 13102 "ImportPage.c"
+#line 13093 "ImportPage.c"
 						}
 					} else {
 						gboolean _tmp22_ = FALSE;
@@ -13125,7 +13116,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 13121 "ImportPage.c"
+#line 13112 "ImportPage.c"
 						}
 					}
 				} else {
@@ -13145,12 +13136,12 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 						_g_object_unref0 (source);
 #line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						return result;
-#line 13141 "ImportPage.c"
+#line 13132 "ImportPage.c"
 					}
 				}
 #line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (photo);
-#line 13146 "ImportPage.c"
+#line 13137 "ImportPage.c"
 			}
 		}
 	}
@@ -13158,7 +13149,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 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((gboolean) (SEARCH_FILTER_CRITERIA_TEXT & _tmp26_)) {
-#line 13154 "ImportPage.c"
+#line 13145 "ImportPage.c"
 		const gchar* keywords = NULL;
 		ImportSource* _tmp27_ = NULL;
 		const gchar* _tmp28_ = NULL;
@@ -13184,11 +13175,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 			_g_object_unref0 (source);
 #line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 13180 "ImportPage.c"
+#line 13171 "ImportPage.c"
 		}
 #line 660 "/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 13184 "ImportPage.c"
+#line 13175 "ImportPage.c"
 		{
 			gchar** word_collection = NULL;
 			gint word_collection_length1 = 0;
@@ -13200,11 +13191,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 			word_collection_length1 = _tmp31_;
 #line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			for (word_it = 0; word_it < _tmp31_; word_it = word_it + 1) {
-#line 13196 "ImportPage.c"
+#line 13187 "ImportPage.c"
 				const gchar* word = NULL;
 #line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				word = word_collection[word_it];
-#line 13200 "ImportPage.c"
+#line 13191 "ImportPage.c"
 				{
 					const gchar* _tmp33_ = NULL;
 					const gchar* _tmp34_ = NULL;
@@ -13223,7 +13214,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 						_g_object_unref0 (source);
 #line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						return result;
-#line 13219 "ImportPage.c"
+#line 13210 "ImportPage.c"
 					}
 				}
 			}
@@ -13235,7 +13226,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 	_g_object_unref0 (source);
 #line 666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13231 "ImportPage.c"
+#line 13222 "ImportPage.c"
 }
 
 
@@ -13245,14 +13236,14 @@ static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view
 	self = (ImportPageImportPageSearchViewFilter*) search_view_filter_construct (object_type);
 #line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 13241 "ImportPage.c"
+#line 13232 "ImportPage.c"
 }
 
 
 static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_new (void) {
 #line 627 "/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 13248 "ImportPage.c"
+#line 13239 "ImportPage.c"
 }
 
 
@@ -13263,7 +13254,7 @@ static void import_page_import_page_search_view_filter_class_init (ImportPageImp
 	((SearchViewFilterClass *) klass)->get_criteria = import_page_import_page_search_view_filter_real_get_criteria;
 #line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((ViewFilterClass *) klass)->predicate = import_page_import_page_search_view_filter_real_predicate;
-#line 13259 "ImportPage.c"
+#line 13250 "ImportPage.c"
 }
 
 
@@ -13300,7 +13291,7 @@ static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter
 	result = !_tmp1_;
 #line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13296 "ImportPage.c"
+#line 13287 "ImportPage.c"
 }
 
 
@@ -13310,14 +13301,14 @@ static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_c
 	self = (ImportPageHideImportedViewFilter*) view_filter_construct (object_type);
 #line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 13306 "ImportPage.c"
+#line 13297 "ImportPage.c"
 }
 
 
 static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_new (void) {
 #line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_hide_imported_view_filter_construct (IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER);
-#line 13313 "ImportPage.c"
+#line 13304 "ImportPage.c"
 }
 
 
@@ -13326,7 +13317,7 @@ static void import_page_hide_imported_view_filter_class_init (ImportPageHideImpo
 	import_page_hide_imported_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((ViewFilterClass *) klass)->predicate = import_page_hide_imported_view_filter_real_predicate;
-#line 13322 "ImportPage.c"
+#line 13313 "ImportPage.c"
 }
 
 
@@ -13375,7 +13366,7 @@ static void import_page_class_init (ImportPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = import_page_real_get_search_view_filter;
 #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = import_page_finalize;
-#line 13371 "ImportPage.c"
+#line 13362 "ImportPage.c"
 }
 
 
@@ -13420,7 +13411,7 @@ static void import_page_instance_init (ImportPage * self) {
 	_tmp3_ = import_page_hide_imported_view_filter_new ();
 #line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->hide_imported_filter = _tmp3_;
-#line 13416 "ImportPage.c"
+#line 13407 "ImportPage.c"
 }
 
 
@@ -13474,7 +13465,7 @@ static void import_page_finalize (GObject* obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (import_page_parent_class)->finalize (obj);
-#line 13470 "ImportPage.c"
+#line 13461 "ImportPage.c"
 }
 
 
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index 352bba6..92445bb 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -758,8 +758,8 @@ public class ImportPage : CheckerboardPage {
         LibraryPhoto.global.contents_altered.connect(on_media_added_removed);
         Video.global.contents_altered.connect(on_media_added_removed);
         
-        init_item_context_menu("/ImportContextMenu");
-        init_page_context_menu("/ImportContextMenu");
+        init_item_context_menu("ImportContextMenu");
+        init_page_context_menu("ImportContextMenu");
     }
     
     ~ImportPage() {
@@ -877,7 +877,7 @@ public class ImportPage : CheckerboardPage {
 
         AppWindow.get_instance ().add_action_entries (entries, this);
 
-        (get_action ("ViewTitle") as GLib.SimpleAction).set_state (Config.Facade.get_instance ().get_display_photo_titles ());
+        get_action ("ViewTitle").change_state (Config.Facade.get_instance ().get_display_photo_titles ());
     }
     
     public GPhoto.Camera get_camera() {
diff --git a/src/config/Config.c b/src/config/Config.c
index 013f9ba..a8afbd2 100644
--- a/src/config/Config.c
+++ b/src/config/Config.c
@@ -1,4 +1,4 @@
-/* Config.c generated by valac 0.34.2, the Vala compiler
+/* Config.c generated by valac 0.32.1, 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 484b46a..3b5e59a 100644
--- a/src/config/ConfigurationInterfaces.c
+++ b/src/config/ConfigurationInterfaces.c
@@ -1,4 +1,4 @@
-/* ConfigurationInterfaces.c generated by valac 0.34.2, the Vala compiler
+/* ConfigurationInterfaces.c generated by valac 0.32.1, the Vala compiler
  * generated from ConfigurationInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -11804,13 +11804,13 @@ void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, g
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return;
 #line 11811 "ConfigurationInterfaces.c"
 }
@@ -11828,35 +11828,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 11857 "ConfigurationInterfaces.c"
 }
diff --git a/src/config/GSettingsEngine.c b/src/config/GSettingsEngine.c
index 405f807..10e5c92 100644
--- a/src/config/GSettingsEngine.c
+++ b/src/config/GSettingsEngine.c
@@ -1,4 +1,4 @@
-/* GSettingsEngine.c generated by valac 0.34.2, the Vala compiler
+/* GSettingsEngine.c generated by valac 0.32.1, the Vala compiler
  * generated from GSettingsEngine.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3338,11 +3338,11 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 3348 "GSettingsEngine.c"
 	{
@@ -3357,73 +3357,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 3379 "GSettingsEngine.c"
 				goto __catch201_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 3388 "GSettingsEngine.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 3404 "GSettingsEngine.c"
 				goto __catch201_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 3415 "GSettingsEngine.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 3429 "GSettingsEngine.c"
 	}
@@ -3431,24 +3431,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch201_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 3443 "GSettingsEngine.c"
 	}
 	__finally201:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
 #line 3454 "GSettingsEngine.c"
 	}
@@ -3460,19 +3460,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 3478 "GSettingsEngine.c"
 }
@@ -3941,37 +3941,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 3957 "GSettingsEngine.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 3965 "GSettingsEngine.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 3977 "GSettingsEngine.c"
 	}
@@ -3991,112 +3991,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 4001 "GSettingsEngine.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 4007 "GSettingsEngine.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 4011 "GSettingsEngine.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 4015 "GSettingsEngine.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 4027 "GSettingsEngine.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 4037 "GSettingsEngine.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 4043 "GSettingsEngine.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 4057 "GSettingsEngine.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 4067 "GSettingsEngine.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 4073 "GSettingsEngine.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 4082 "GSettingsEngine.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 4102 "GSettingsEngine.c"
 }
diff --git a/src/core/Alteration.c b/src/core/Alteration.c
index c8b2460..2bb624a 100644
--- a/src/core/Alteration.c
+++ b/src/core/Alteration.c
@@ -1,4 +1,4 @@
-/* Alteration.c generated by valac 0.34.2, the Vala compiler
+/* Alteration.c generated by valac 0.32.1, the Vala compiler
  * generated from Alteration.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -426,19 +426,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 444 "Alteration.c"
 }
diff --git a/src/core/ContainerSourceCollection.c b/src/core/ContainerSourceCollection.c
index 20da1f2..cd22228 100644
--- a/src/core/ContainerSourceCollection.c
+++ b/src/core/ContainerSourceCollection.c
@@ -1,4 +1,4 @@
-/* ContainerSourceCollection.c generated by valac 0.34.2, the Vala compiler
+/* ContainerSourceCollection.c generated by valac 0.32.1, the Vala compiler
  * generated from ContainerSourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/Core.c b/src/core/Core.c
index ee28231..7fd60d2 100644
--- a/src/core/Core.c
+++ b/src/core/Core.c
@@ -1,4 +1,4 @@
-/* Core.c generated by valac 0.34.2, the Vala compiler
+/* Core.c generated by valac 0.32.1, 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 7265c0f..7040412 100644
--- a/src/core/DataCollection.c
+++ b/src/core/DataCollection.c
@@ -1,4 +1,4 @@
-/* DataCollection.c generated by valac 0.34.2, the Vala compiler
+/* DataCollection.c generated by valac 0.32.1, the Vala compiler
  * generated from DataCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataObject.c b/src/core/DataObject.c
index 2bac8f3..7aaf2eb 100644
--- a/src/core/DataObject.c
+++ b/src/core/DataObject.c
@@ -1,4 +1,4 @@
-/* DataObject.c generated by valac 0.34.2, the Vala compiler
+/* DataObject.c generated by valac 0.32.1, the Vala compiler
  * generated from DataObject.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataSet.c b/src/core/DataSet.c
index a6c2415..75c2ca2 100644
--- a/src/core/DataSet.c
+++ b/src/core/DataSet.c
@@ -1,4 +1,4 @@
-/* DataSet.c generated by valac 0.34.2, the Vala compiler
+/* DataSet.c generated by valac 0.32.1, the Vala compiler
  * generated from DataSet.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index ba9cf0d..cb4dfca 100644
--- a/src/core/DataSource.c
+++ b/src/core/DataSource.c
@@ -1,4 +1,4 @@
-/* DataSource.c generated by valac 0.34.2, the Vala compiler
+/* DataSource.c generated by valac 0.32.1, the Vala compiler
  * generated from DataSource.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3356,19 +3356,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 3373 "DataSource.c"
 }
@@ -3499,17 +3499,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 3514 "DataSource.c"
 }
@@ -3745,15 +3745,15 @@ static gint64 int64_parse (const gchar* str) {
 	gint64 result = 0LL;
 	const gchar* _tmp0_ = NULL;
 	gint64 _tmp1_ = 0LL;
-#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 679 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0LL);
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 3758 "DataSource.c"
 }
diff --git a/src/core/DataSourceTypes.c b/src/core/DataSourceTypes.c
index a4f1f8b..0abd6e8 100644
--- a/src/core/DataSourceTypes.c
+++ b/src/core/DataSourceTypes.c
@@ -1,4 +1,4 @@
-/* DataSourceTypes.c generated by valac 0.34.2, the Vala compiler
+/* DataSourceTypes.c generated by valac 0.32.1, the Vala compiler
  * generated from DataSourceTypes.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataView.c b/src/core/DataView.c
index 417b78d..40153fc 100644
--- a/src/core/DataView.c
+++ b/src/core/DataView.c
@@ -1,4 +1,4 @@
-/* DataView.c generated by valac 0.34.2, the Vala compiler
+/* DataView.c generated by valac 0.32.1, the Vala compiler
  * generated from DataView.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataViewTypes.c b/src/core/DataViewTypes.c
index 24ff8cb..0e55db0 100644
--- a/src/core/DataViewTypes.c
+++ b/src/core/DataViewTypes.c
@@ -1,4 +1,4 @@
-/* DataViewTypes.c generated by valac 0.34.2, the Vala compiler
+/* DataViewTypes.c generated by valac 0.32.1, the Vala compiler
  * generated from DataViewTypes.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c
index c6c3cc9..b83be40 100644
--- a/src/core/DatabaseSourceCollection.c
+++ b/src/core/DatabaseSourceCollection.c
@@ -1,4 +1,4 @@
-/* DatabaseSourceCollection.c generated by valac 0.34.2, the Vala compiler
+/* DatabaseSourceCollection.c generated by valac 0.32.1, the Vala compiler
  * generated from DatabaseSourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c
index 3b2bcb6..6321f92 100644
--- a/src/core/SourceCollection.c
+++ b/src/core/SourceCollection.c
@@ -1,4 +1,4 @@
-/* SourceCollection.c generated by valac 0.34.2, the Vala compiler
+/* SourceCollection.c generated by valac 0.32.1, the Vala compiler
  * generated from SourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c
index 8b812ba..ed7d671 100644
--- a/src/core/SourceHoldingTank.c
+++ b/src/core/SourceHoldingTank.c
@@ -1,4 +1,4 @@
-/* SourceHoldingTank.c generated by valac 0.34.2, the Vala compiler
+/* SourceHoldingTank.c generated by valac 0.32.1, the Vala compiler
  * generated from SourceHoldingTank.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/SourceInterfaces.c b/src/core/SourceInterfaces.c
index c76f0d2..5cfc5a9 100644
--- a/src/core/SourceInterfaces.c
+++ b/src/core/SourceInterfaces.c
@@ -1,4 +1,4 @@
-/* SourceInterfaces.c generated by valac 0.34.2, the Vala compiler
+/* SourceInterfaces.c generated by valac 0.32.1, 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 a22b096..fa66f0e 100644
--- a/src/core/Tracker.c
+++ b/src/core/Tracker.c
@@ -1,4 +1,4 @@
-/* Tracker.c generated by valac 0.34.2, the Vala compiler
+/* Tracker.c generated by valac 0.32.1, 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 0b5431f..dceff91 100644
--- a/src/core/ViewCollection.c
+++ b/src/core/ViewCollection.c
@@ -1,4 +1,4 @@
-/* ViewCollection.c generated by valac 0.34.2, the Vala compiler
+/* ViewCollection.c generated by valac 0.32.1, the Vala compiler
  * generated from ViewCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/util.c b/src/core/util.c
index ba8c9f8..0088011 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -1,4 +1,4 @@
-/* util.c generated by valac 0.34.2, the Vala compiler
+/* util.c generated by valac 0.32.1, the Vala compiler
  * generated from util.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c
index b21d97e..1cef36b 100644
--- a/src/data_imports/DataImportJob.c
+++ b/src/data_imports/DataImportJob.c
@@ -1,4 +1,4 @@
-/* DataImportJob.c generated by valac 0.34.2, the Vala compiler
+/* DataImportJob.c generated by valac 0.32.1, the Vala compiler
  * generated from DataImportJob.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c
index f6a52ee..8844716 100644
--- a/src/data_imports/DataImportSource.c
+++ b/src/data_imports/DataImportSource.c
@@ -1,4 +1,4 @@
-/* DataImportSource.c generated by valac 0.34.2, the Vala compiler
+/* DataImportSource.c generated by valac 0.32.1, 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 3e618b0..2a1983e 100644
--- a/src/data_imports/DataImports.c
+++ b/src/data_imports/DataImports.c
@@ -1,4 +1,4 @@
-/* DataImports.c generated by valac 0.34.2, the Vala compiler
+/* DataImports.c generated by valac 0.32.1, 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 cf3d857..8f48c0e 100644
--- a/src/data_imports/DataImportsPluginHost.c
+++ b/src/data_imports/DataImportsPluginHost.c
@@ -1,4 +1,4 @@
-/* DataImportsPluginHost.c generated by valac 0.34.2, the Vala compiler
+/* DataImportsPluginHost.c generated by valac 0.32.1, the Vala compiler
  * generated from DataImportsPluginHost.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c
index 338abba..ef4b89a 100644
--- a/src/data_imports/DataImportsUI.c
+++ b/src/data_imports/DataImportsUI.c
@@ -1,4 +1,4 @@
-/* DataImportsUI.c generated by valac 0.34.2, the Vala compiler
+/* DataImportsUI.c generated by valac 0.32.1, 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 c12525d..d1df4f4 100644
--- a/src/db/DatabaseTable.c
+++ b/src/db/DatabaseTable.c
@@ -1,4 +1,4 @@
-/* DatabaseTable.c generated by valac 0.34.2, the Vala compiler
+/* DatabaseTable.c generated by valac 0.32.1, the Vala compiler
  * generated from DatabaseTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -343,54 +343,54 @@ static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback cal
 	const gchar* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	const gchar* _tmp6_ = NULL;
-#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	g_return_val_if_fail (sql != NULL, 0);
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	_tmp0_ = sql;
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	_tmp1_ = callback;
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	_tmp1__target = callback_target;
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	_tmp3_ = sqlite3_exec (self, _tmp0_, _tmp1_, _tmp1__target, (char**) (&_tmp2_));
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	sqlite_errmsg = _tmp2_;
-#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	ec = _tmp3_;
-#line 37 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 37 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	if ((&_vala_errmsg) != NULL) {
 #line 365 "DatabaseTable.c"
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 		_tmp4_ = sqlite_errmsg;
-#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 		_tmp5_ = g_strdup (_tmp4_);
-#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 		_g_free0 (_vala_errmsg);
-#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 		_vala_errmsg = _tmp5_;
 #line 376 "DatabaseTable.c"
 	}
-#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	_tmp6_ = sqlite_errmsg;
-#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	sqlite3_free ((void*) _tmp6_);
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	result = ec;
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	if (errmsg) {
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 		*errmsg = _vala_errmsg;
 #line 388 "DatabaseTable.c"
 	} else {
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 		_g_free0 (_vala_errmsg);
 #line 392 "DatabaseTable.c"
 	}
-#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
 	return result;
 #line 396 "DatabaseTable.c"
 }
diff --git a/src/db/Db.c b/src/db/Db.c
index 2ad8248..9c7e328 100644
--- a/src/db/Db.c
+++ b/src/db/Db.c
@@ -1,4 +1,4 @@
-/* Db.c generated by valac 0.34.2, the Vala compiler
+/* Db.c generated by valac 0.32.1, 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 63e2198..0e763e9 100644
--- a/src/db/EventTable.c
+++ b/src/db/EventTable.c
@@ -1,4 +1,4 @@
-/* EventTable.c generated by valac 0.34.2, the Vala compiler
+/* EventTable.c generated by valac 0.32.1, the Vala compiler
  * generated from EventTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c
index 7551157..a2923f7 100644
--- a/src/db/PhotoTable.c
+++ b/src/db/PhotoTable.c
@@ -1,4 +1,4 @@
-/* PhotoTable.c generated by valac 0.34.2, the Vala compiler
+/* PhotoTable.c generated by valac 0.32.1, the Vala compiler
  * generated from PhotoTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c
index 7a115ab..1747d47 100644
--- a/src/db/SavedSearchDBTable.c
+++ b/src/db/SavedSearchDBTable.c
@@ -1,4 +1,4 @@
-/* SavedSearchDBTable.c generated by valac 0.34.2, the Vala compiler
+/* SavedSearchDBTable.c generated by valac 0.32.1, the Vala compiler
  * generated from SavedSearchDBTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/TagTable.c b/src/db/TagTable.c
index bd98bc0..1c58788 100644
--- a/src/db/TagTable.c
+++ b/src/db/TagTable.c
@@ -1,4 +1,4 @@
-/* TagTable.c generated by valac 0.34.2, the Vala compiler
+/* TagTable.c generated by valac 0.32.1, the Vala compiler
  * generated from TagTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -645,11 +645,11 @@ static gpointer _g_object_ref0 (gpointer self) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 655 "TagTable.c"
 	{
@@ -664,73 +664,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 686 "TagTable.c"
 				goto __catch19_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 695 "TagTable.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 711 "TagTable.c"
 				goto __catch19_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 722 "TagTable.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 736 "TagTable.c"
 	}
@@ -738,24 +738,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch19_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 750 "TagTable.c"
 	}
 	__finally19:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
 #line 761 "TagTable.c"
 	}
@@ -2013,15 +2013,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 2025 "TagTable.c"
 }
diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c
index c9afb97..542e568 100644
--- a/src/db/TombstoneTable.c
+++ b/src/db/TombstoneTable.c
@@ -1,4 +1,4 @@
-/* TombstoneTable.c generated by valac 0.34.2, the Vala compiler
+/* TombstoneTable.c generated by valac 0.32.1, 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 7aa577a..fa79d52 100644
--- a/src/db/VersionTable.c
+++ b/src/db/VersionTable.c
@@ -1,4 +1,4 @@
-/* VersionTable.c generated by valac 0.34.2, the Vala compiler
+/* VersionTable.c generated by valac 0.32.1, 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 736818c..8b8d78a 100644
--- a/src/db/VideoTable.c
+++ b/src/db/VideoTable.c
@@ -1,4 +1,4 @@
-/* VideoTable.c generated by valac 0.34.2, the Vala compiler
+/* VideoTable.c generated by valac 0.32.1, the Vala compiler
  * generated from VideoTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/Direct.c b/src/direct/Direct.c
index f526072..2e1bfa4 100644
--- a/src/direct/Direct.c
+++ b/src/direct/Direct.c
@@ -1,4 +1,4 @@
-/* Direct.c generated by valac 0.34.2, the Vala compiler
+/* Direct.c generated by valac 0.32.1, 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 bcb3ed3..97ebcd5 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -1,4 +1,4 @@
-/* DirectPhoto.c generated by valac 0.34.2, the Vala compiler
+/* DirectPhoto.c generated by valac 0.32.1, the Vala compiler
  * generated from DirectPhoto.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2791,7 +2791,7 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle
 #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_TYPE_FILE, (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);
 #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 4e7eaef..807c74b 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -1,4 +1,4 @@
-/* DirectPhotoPage.c generated by valac 0.34.2, the Vala compiler
+/* DirectPhotoPage.c generated by valac 0.32.1, the Vala compiler
  * generated from DirectPhotoPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1277,7 +1277,7 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
 #line 83 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = _ ("Set as _Desktop Background");
 #line 83 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	injection_group_add_menu_item (bg_group, _tmp7_, "SetBackground", NULL);
+	injection_group_add_menu_item (bg_group, _tmp7_, "SetBackground", "<Primary>b");
 #line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = groups;
 #line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
index 57dfe11..9688aa5 100644
--- a/src/direct/DirectPhotoPage.vala
+++ b/src/direct/DirectPhotoPage.vala
@@ -80,7 +80,7 @@ public class DirectPhotoPage : EditingHostPage {
         groups += print_group;
         
         InjectionGroup bg_group = new InjectionGroup("SetBackgroundPlaceholder");
-        bg_group.add_menu_item(_("Set as _Desktop Background"), "SetBackground");
+        bg_group.add_menu_item(_("Set as _Desktop Background"), "SetBackground", "<Primary>b");
         
         groups += bg_group;
         
diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c
index e4ec0ca..e3cebb7 100644
--- a/src/direct/DirectView.c
+++ b/src/direct/DirectView.c
@@ -1,4 +1,4 @@
-/* DirectView.c generated by valac 0.34.2, the Vala compiler
+/* DirectView.c generated by valac 0.32.1, the Vala compiler
  * generated from DirectView.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c
index 2d6ffc1..dc9432e 100644
--- a/src/direct/DirectWindow.c
+++ b/src/direct/DirectWindow.c
@@ -1,4 +1,4 @@
-/* DirectWindow.c generated by valac 0.34.2, the Vala compiler
+/* DirectWindow.c generated by valac 0.32.1, the Vala compiler
  * generated from DirectWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -326,6 +326,7 @@ void page_switched_to (Page* self);
 GtkToolbar* page_get_toolbar (Page* self);
 void application_set_menubar (GMenuModel* model);
 GMenuModel* page_get_menubar (Page* self);
+void application_set_appmenu (GMenuModel* model);
 DirectWindow* direct_window_get_app (void);
 DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self);
 Page* page_window_get_current_page (PageWindow* self);
@@ -364,14 +365,14 @@ static void direct_window_finalize (GObject* obj);
 static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	direct_window_on_photo_changed ((DirectWindow*) self);
-#line 368 "DirectWindow.c"
+#line 369 "DirectWindow.c"
 }
 
 
 static void _direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	direct_window_on_photo_changed ((DirectWindow*) self);
-#line 375 "DirectWindow.c"
+#line 376 "DirectWindow.c"
 }
 
 
@@ -394,9 +395,12 @@ DirectWindow* direct_window_construct (GType object_type, GFile* file) {
 	DirectPhotoPage* _tmp13_ = NULL;
 	GtkToolbar* _tmp14_ = NULL;
 	GtkToolbar* _tmp15_ = NULL;
-	DirectPhotoPage* _tmp16_ = NULL;
-	GMenuModel* _tmp17_ = NULL;
+	GtkBuilder* builder = NULL;
+	GtkBuilder* _tmp16_ = NULL;
+	DirectPhotoPage* _tmp17_ = NULL;
 	GMenuModel* _tmp18_ = NULL;
+	GMenuModel* _tmp19_ = NULL;
+	GObject* _tmp20_ = NULL;
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -464,36 +468,46 @@ DirectWindow* direct_window_construct (GType object_type, GFile* file) {
 #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp15_);
 #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp16_ = self->priv->direct_photo_page;
+	_tmp16_ = gtk_builder_new_from_resource ("/org/gnome/Shotwell/appmenu.ui");
 #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp17_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE, Page));
-#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp18_ = _tmp17_;
-#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	application_set_menubar (_tmp18_);
-#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_g_object_unref0 (_tmp18_);
+	builder = _tmp16_;
+#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	_tmp17_ = self->priv->direct_photo_page;
+#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	_tmp18_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PAGE, Page));
+#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	_tmp19_ = _tmp18_;
+#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	application_set_menubar (_tmp19_);
+#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	_g_object_unref0 (_tmp19_);
 #line 29 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	_tmp20_ = gtk_builder_get_object (builder, "direct-appmenu");
+#line 29 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	application_set_appmenu (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, g_menu_get_type ()) ? ((GMenu*) _tmp20_) : NULL, g_menu_model_get_type (), GMenuModel));
+#line 31 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget));
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	_g_object_unref0 (builder);
+#line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (layout);
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return self;
-#line 483 "DirectWindow.c"
+#line 497 "DirectWindow.c"
 }
 
 
 DirectWindow* direct_window_new (GFile* file) {
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return direct_window_construct (TYPE_DIRECT_WINDOW, file);
-#line 490 "DirectWindow.c"
+#line 504 "DirectWindow.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 497 "DirectWindow.c"
+#line 511 "DirectWindow.c"
 }
 
 
@@ -501,30 +515,30 @@ DirectWindow* direct_window_get_app (void) {
 	DirectWindow* result = NULL;
 	AppWindow* _tmp0_ = NULL;
 	DirectWindow* _tmp1_ = NULL;
-#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_WINDOW, DirectWindow));
-#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = _tmp1_;
-#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 513 "DirectWindow.c"
+#line 527 "DirectWindow.c"
 }
 
 
 DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) {
 	DirectPhotoPage* result = NULL;
 	Page* _tmp0_ = NULL;
-#line 36 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 38 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (IS_DIRECT_WINDOW (self), NULL);
-#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 39 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 39 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 39 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 528 "DirectWindow.c"
+#line 542 "DirectWindow.c"
 }
 
 
@@ -541,53 +555,53 @@ void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modif
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_if_fail (IS_DIRECT_WINDOW (self));
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = modified;
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp1_) {
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp0_ = "*";
-#line 555 "DirectWindow.c"
+#line 569 "DirectWindow.c"
 	} else {
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp0_ = "";
-#line 559 "DirectWindow.c"
+#line 573 "DirectWindow.c"
 	}
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = file;
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp3_ = g_file_get_basename (_tmp2_);
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp5_ = file;
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp6_ = g_file_get_parent (_tmp5_);
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp8_ = get_display_pathname (_tmp7_);
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp10_ = g_strdup_printf ("%s%s (%s) - %s", _tmp0_, _tmp4_, _tmp9_, RESOURCES_APP_TITLE);
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp11_);
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_free0 (_tmp11_);
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_free0 (_tmp9_);
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_free0 (_tmp4_);
-#line 591 "DirectWindow.c"
+#line 605 "DirectWindow.c"
 }
 
 
@@ -600,33 +614,33 @@ static void direct_window_real_on_fullscreen (AppWindow* base) {
 	GFile* _tmp3_ = NULL;
 	DirectFullscreenPhotoPage* _tmp4_ = NULL;
 	DirectFullscreenPhotoPage* _tmp5_ = NULL;
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 47 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
-#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = direct_window_get_direct_page (self);
-#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = direct_photo_page_get_current_file (_tmp1_);
-#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	file = _tmp3_;
 #line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	file = _tmp3_;
+#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp4_ = direct_fullscreen_photo_page_new (file);
-#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_object_ref_sink (_tmp4_);
-#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	app_window_go_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE, Page));
-#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 47 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (file);
-#line 630 "DirectWindow.c"
+#line 644 "DirectWindow.c"
 }
 
 
@@ -634,15 +648,15 @@ static gchar* direct_window_real_get_app_role (AppWindow* base) {
 	DirectWindow * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 51 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 53 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
-#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = g_strdup (RESOURCES_APP_DIRECT_ROLE);
-#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = _tmp0_;
-#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 646 "DirectWindow.c"
+#line 660 "DirectWindow.c"
 }
 
 
@@ -651,43 +665,43 @@ static void direct_window_on_photo_changed (DirectWindow* self) {
 	DirectPhotoPage* _tmp0_ = NULL;
 	Photo* _tmp1_ = NULL;
 	Photo* _tmp2_ = NULL;
-#line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_if_fail (IS_DIRECT_WINDOW (self));
-#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = self->priv->direct_photo_page;
-#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	photo = _tmp1_;
-#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 59 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = photo;
-#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 59 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 667 "DirectWindow.c"
+#line 681 "DirectWindow.c"
 		Photo* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
 		Photo* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
-#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp3_ = photo;
-#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp4_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp6_ = photo;
-#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp7_ = photo_has_alterations (_tmp6_);
-#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		direct_window_update_title (self, _tmp5_, _tmp7_);
-#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 687 "DirectWindow.c"
+#line 701 "DirectWindow.c"
 	}
-#line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (photo);
-#line 691 "DirectWindow.c"
+#line 705 "DirectWindow.c"
 }
 
 
@@ -701,39 +715,39 @@ static void direct_window_real_on_quit (AppWindow* base) {
 	ConfigFacade* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
 	Dimensions _tmp7_ = {0};
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 63 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
-#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = direct_window_get_direct_page (self);
-#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = direct_photo_page_check_quit (_tmp1_);
-#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp3_ = !_tmp2_;
-#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp3_) {
-#line 63 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return;
-#line 721 "DirectWindow.c"
+#line 735 "DirectWindow.c"
 	}
-#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized;
-#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions;
-#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	configuration_facade_set_direct_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_, &_tmp7_);
-#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_g_object_unref0 (_tmp5_);
 #line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	_g_object_unref0 (_tmp5_);
+#line 69 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	APP_WINDOW_CLASS (direct_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
-#line 737 "DirectWindow.c"
+#line 751 "DirectWindow.c"
 }
 
 
@@ -745,50 +759,50 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = direct_window_get_direct_page (self);
-#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = direct_photo_page_check_quit (_tmp1_);
-#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp3_ = !_tmp2_;
-#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp3_) {
-#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		result = TRUE;
-#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return result;
-#line 769 "DirectWindow.c"
+#line 783 "DirectWindow.c"
 	}
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event != NULL) {
-#line 773 "DirectWindow.c"
+#line 787 "DirectWindow.c"
 		GdkEventAny* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp5_ = event;
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp6_ = GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp4_ = _tmp6_;
-#line 782 "DirectWindow.c"
+#line 796 "DirectWindow.c"
 	} else {
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp4_ = FALSE;
-#line 786 "DirectWindow.c"
+#line 800 "DirectWindow.c"
 	}
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = _tmp4_;
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 792 "DirectWindow.c"
+#line 806 "DirectWindow.c"
 }
 
 
@@ -797,29 +811,29 @@ static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEvent
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	GdkEventType _tmp1_ = 0;
-#line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 79 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
-#line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 79 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = event;
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_->type;
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp1_ == GDK_2BUTTON_PRESS) {
-#line 79 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-		app_window_on_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
 #line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+		app_window_on_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
+#line 83 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		result = TRUE;
-#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 83 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return result;
-#line 817 "DirectWindow.c"
+#line 831 "DirectWindow.c"
 	}
-#line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 86 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = FALSE;
-#line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 86 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 823 "DirectWindow.c"
+#line 837 "DirectWindow.c"
 }
 
 
@@ -830,48 +844,48 @@ static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey
 	guint _tmp1_ = 0U;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
-#line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
 #line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = event;
-#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 90 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-		app_window_on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+		app_window_on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		result = TRUE;
-#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return result;
-#line 852 "DirectWindow.c"
+#line 866 "DirectWindow.c"
 	}
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event != NULL) {
-#line 856 "DirectWindow.c"
+#line 870 "DirectWindow.c"
 		GdkEventKey* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp4_ = event;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp5_ = GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp4_);
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp3_ = _tmp5_;
-#line 865 "DirectWindow.c"
+#line 879 "DirectWindow.c"
 	} else {
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp3_ = FALSE;
-#line 869 "DirectWindow.c"
+#line 883 "DirectWindow.c"
 	}
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = _tmp3_;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 875 "DirectWindow.c"
+#line 889 "DirectWindow.c"
 }
 
 
@@ -894,14 +908,14 @@ static void direct_window_class_init (DirectWindowClass * klass) {
 	((GtkWidgetClass *) klass)->key_press_event = 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"
+#line 912 "DirectWindow.c"
 }
 
 
 static void direct_window_instance_init (DirectWindow * self) {
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self->priv = DIRECT_WINDOW_GET_PRIVATE (self);
-#line 905 "DirectWindow.c"
+#line 919 "DirectWindow.c"
 }
 
 
@@ -913,7 +927,7 @@ static void direct_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->direct_photo_page);
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	G_OBJECT_CLASS (direct_window_parent_class)->finalize (obj);
-#line 917 "DirectWindow.c"
+#line 931 "DirectWindow.c"
 }
 
 
diff --git a/src/direct/DirectWindow.vala b/src/direct/DirectWindow.vala
index e1cbf75..ee1995a 100644
--- a/src/direct/DirectWindow.vala
+++ b/src/direct/DirectWindow.vala
@@ -24,7 +24,9 @@ public class DirectWindow : AppWindow {
         layout.pack_start(direct_photo_page, true, true, 0);
         layout.pack_end(direct_photo_page.get_toolbar(), false, false, 0);
         
+        var builder = new Gtk.Builder.from_resource ("/org/gnome/Shotwell/appmenu.ui");
         Application.set_menubar (direct_photo_page.get_menubar ());
+        Application.set_appmenu (builder.get_object ("direct-appmenu") as GLib.Menu);
 
         add(layout);
     }
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c
index 92f41f9..05012c9 100644
--- a/src/editing_tools/EditingTools.c
+++ b/src/editing_tools/EditingTools.c
@@ -1,4 +1,4 @@
-/* EditingTools.c generated by valac 0.34.2, the Vala compiler
+/* EditingTools.c generated by valac 0.32.1, the Vala compiler
  * generated from EditingTools.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1036,8 +1036,8 @@ enum  {
 };
 #define EDITING_TOOLS_EDITING_TOOL_WINDOW_FRAME_BORDER 6
 EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, GtkWindow* container);
-void suppress_warnings (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message);
-static void _suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self);
+static void editing_tools_editing_tool_window_suppress_warnings (EditingToolsEditingToolWindow* self, const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message);
+static void _editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self);
 static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkWidget* widget);
 gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self);
 static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidget* base, GdkEventKey* event);
@@ -1679,9 +1679,9 @@ void editing_tools_terminate (void) {
 }
 
 
-static void _suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
-#line 55 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	suppress_warnings (log_domain, log_levels, message);
+static void _editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
+#line 56 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	editing_tools_editing_tool_window_suppress_warnings ((EditingToolsEditingToolWindow*) self, log_domain, log_levels, message);
 #line 1686 "EditingTools.c"
 }
 
@@ -1736,8 +1736,8 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GTyp
 	gtk_window_set_accept_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
 #line 51 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 55 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_log_set_handler ("Gdk", G_LOG_LEVEL_WARNING, _suppress_warnings_glog_func, NULL);
+#line 56 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_log_set_handler ("Gdk", G_LOG_LEVEL_WARNING, _editing_tools_editing_tool_window_suppress_warnings_glog_func, self);
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (outer_frame);
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1750,15 +1750,15 @@ static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkW
 	EditingToolsEditingToolWindow * self;
 	GtkFrame* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 62 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
-#line 62 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_return_if_fail (GTK_IS_WIDGET (widget));
 #line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_return_if_fail (GTK_IS_WIDGET (widget));
+#line 64 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->layout_frame;
-#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 64 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = widget;
-#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 64 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), _tmp1_);
 #line 1764 "EditingTools.c"
 }
@@ -1767,13 +1767,13 @@ static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkW
 gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 66 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL_WINDOW (self), FALSE);
 #line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL_WINDOW (self), FALSE);
+#line 68 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->user_moved;
-#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 68 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 68 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
 #line 1779 "EditingTools.c"
 }
@@ -1789,37 +1789,37 @@ static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidge
 	GdkEventKey* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
-#line 70 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
-#line 70 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = event;
-#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp1_) {
 #line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if (_tmp1_) {
+#line 73 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 73 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
 #line 1807 "EditingTools.c"
 	}
-#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = event;
-#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp4_, &_tmp5_);
-#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp6_;
-#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
 #line 1825 "EditingTools.c"
 }
@@ -1838,64 +1838,64 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
 	gdouble _tmp10_ = 0.0;
 	GdkEventButton* _tmp11_ = NULL;
 	guint32 _tmp12_ = 0U;
-#line 77 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
-#line 77 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 79 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = event;
-#line 79 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->button;
-#line 79 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ != ((guint) 1)) {
 #line 1852 "EditingTools.c"
 		gboolean _tmp2_ = FALSE;
-#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event != NULL) {
 #line 1856 "EditingTools.c"
 			GdkEventButton* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
-#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp3_ = event;
-#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp4_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = _tmp4_;
 #line 1865 "EditingTools.c"
 		} else {
-#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = TRUE;
 #line 1869 "EditingTools.c"
 		}
-#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = _tmp2_;
-#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
 #line 1875 "EditingTools.c"
 	}
-#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = event;
-#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->button;
-#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = event;
-#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_->x_root;
-#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = event;
-#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_->y_root;
-#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
-#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->time;
-#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_window_begin_move_drag (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), (gint) _tmp6_, (gint) _tmp8_, (gint) _tmp10_, _tmp12_);
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_window_begin_move_drag (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), (gint) _tmp6_, (gint) _tmp8_, (gint) _tmp10_, _tmp12_);
+#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_moved = TRUE;
-#line 85 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 85 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
 #line 1901 "EditingTools.c"
 }
@@ -1903,16 +1903,25 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
 
 static void editing_tools_editing_tool_window_real_realize (GtkWidget* base) {
 	EditingToolsEditingToolWindow * self;
-#line 88 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
 #line 89 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
+#line 90 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_TYPE (self, gtk_widget_get_type ()) ? ((GtkWidget*) self) : NULL, RESOURCES_TRANSIENT_WINDOW_OPACITY);
-#line 91 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 92 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
 #line 1913 "EditingTools.c"
 }
 
 
+static void editing_tools_editing_tool_window_suppress_warnings (EditingToolsEditingToolWindow* self, const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message) {
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL_WINDOW (self));
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_return_if_fail (message != NULL);
+#line 1922 "EditingTools.c"
+}
+
+
 static void editing_tools_editing_tool_window_class_init (EditingToolsEditingToolWindowClass * klass) {
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_window_parent_class = g_type_class_peek_parent (klass);
@@ -1928,7 +1937,7 @@ static void editing_tools_editing_tool_window_class_init (EditingToolsEditingToo
 	((GtkWidgetClass *) klass)->realize = 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 1932 "EditingTools.c"
+#line 1941 "EditingTools.c"
 }
 
 
@@ -1944,7 +1953,7 @@ static void editing_tools_editing_tool_window_instance_init (EditingToolsEditing
 	self->priv->layout_frame = _tmp0_;
 #line 32 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_moved = FALSE;
-#line 1948 "EditingTools.c"
+#line 1957 "EditingTools.c"
 }
 
 
@@ -1954,17 +1963,17 @@ static void editing_tools_editing_tool_window_finalize (GObject* obj) {
 	void* _tmp0__target = NULL;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
-#line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 60 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = g_log_default_handler;
-#line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 60 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0__target = NULL;
-#line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 60 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_log_set_handler ("Gdk", G_LOG_LEVEL_WARNING, _tmp0_, _tmp0__target);
 #line 31 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->layout_frame);
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_editing_tool_window_parent_class)->finalize (obj);
-#line 1968 "EditingTools.c"
+#line 1977 "EditingTools.c"
 }
 
 
@@ -1981,16 +1990,16 @@ GType editing_tools_editing_tool_window_get_type (void) {
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1987 "EditingTools.c"
+#line 1996 "EditingTools.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 1994 "EditingTools.c"
+#line 2003 "EditingTools.c"
 }
 
 
@@ -2012,85 +2021,85 @@ EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type
 	GdkPixbuf* _tmp13_ = NULL;
 	GdkRectangle _tmp14_ = {0};
 	cairo_surface_t* _tmp15_ = NULL;
-#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GDK_IS_WINDOW (drawing_window), NULL);
-#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (default_ctx != NULL, NULL);
-#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (surface_dim != NULL, NULL);
-#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (scaled), NULL);
-#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaled_position != NULL, NULL);
-#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsPhotoCanvas*) g_type_create_instance (object_type);
-#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = container;
-#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->container);
-#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->container = _tmp1_;
-#line 111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = drawing_window;
-#line 111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->drawing_window);
-#line 111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->drawing_window = _tmp3_;
-#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = photo;
-#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
-#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->photo = _tmp5_;
-#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = default_ctx;
-#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _cairo_reference0 (_tmp6_);
-#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->default_ctx);
-#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->default_ctx = _tmp7_;
-#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *surface_dim;
-#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->surface_dim = _tmp8_;
-#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = *scaled_position;
-#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_position = _tmp9_;
-#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = scaled;
-#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->scaled_pixbuf);
-#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_pixbuf = _tmp11_;
-#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = default_ctx;
-#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = scaled;
-#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = *scaled_position;
-#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = editing_tools_photo_canvas_pixbuf_to_surface (self, _tmp12_, _tmp13_, &_tmp14_);
-#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->scaled);
-#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled = _tmp15_;
-#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 2094 "EditingTools.c"
+#line 2103 "EditingTools.c"
 }
 
 
@@ -2098,21 +2107,21 @@ void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* s
 	Photo* _tmp0_ = NULL;
 	GdkRectangle _tmp1_ = {0};
 	GdkRectangle _tmp2_ = {0};
-#line 125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (rectangle != NULL);
-#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->photo;
-#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = *rectangle;
-#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_unscaled_to_raw_rect (_tmp0_, &_tmp1_, &_tmp2_);
-#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp2_;
-#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2116 "EditingTools.c"
+#line 2125 "EditingTools.c"
 }
 
 
@@ -2138,61 +2147,61 @@ void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanva
 	gint _tmp13_ = 0;
 	GdkPoint _tmp14_ = {0};
 	gint _tmp15_ = 0;
-#line 129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (active_point != NULL);
-#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (self, &_tmp0_);
-#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaled_position = _tmp0_;
-#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->photo;
-#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp2_);
-#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	unscaled_dims = _tmp2_;
-#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = unscaled_dims;
-#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.width;
-#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = scaled_position;
-#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.width;
-#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scale_factor_x = ((gdouble) _tmp4_) / ((gdouble) _tmp6_);
-#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = unscaled_dims;
-#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.height;
-#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = scaled_position;
-#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.height;
-#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scale_factor_y = ((gdouble) _tmp8_) / ((gdouble) _tmp10_);
-#line 138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_.x = 0;
-#line 138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp11_;
-#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = *active_point;
-#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.x;
-#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.x = (gint) ((((gdouble) _tmp13_) * scale_factor_x) + 0.5);
-#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = *active_point;
-#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_.y;
-#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.y = (gint) ((((gdouble) _tmp15_) * scale_factor_y) + 0.5);
-#line 142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
-#line 142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2196 "EditingTools.c"
+#line 2205 "EditingTools.c"
 }
 
 
@@ -2230,101 +2239,101 @@ void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas
 	gint _tmp27_ = 0;
 	GdkPoint _tmp28_ = {0};
 	gint _tmp29_ = 0;
-#line 145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (active_rect != NULL);
-#line 146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_.x = 0;
-#line 146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left = _tmp0_;
-#line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_.x = 0;
-#line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right = _tmp1_;
-#line 148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *active_rect;
-#line 148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left.x = _tmp3_;
-#line 149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *active_rect;
-#line 149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.y;
-#line 149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left.y = _tmp5_;
-#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = upper_left;
-#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.x;
-#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *active_rect;
-#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.width;
-#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right.x = _tmp7_ + _tmp9_;
-#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = upper_left;
-#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.y;
-#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = *active_rect;
-#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.height;
-#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right.y = _tmp11_ + _tmp13_;
-#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = upper_left;
-#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_active_to_unscaled_point (self, &_tmp14_, &_tmp15_);
-#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left = _tmp15_;
-#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = lower_right;
-#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_active_to_unscaled_point (self, &_tmp16_, &_tmp17_);
-#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right = _tmp17_;
-#line 156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (&unscaled_rect, 0, sizeof (GdkRectangle));
-#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = upper_left;
-#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.x;
-#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	unscaled_rect.x = _tmp19_;
-#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = upper_left;
-#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_.y;
-#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	unscaled_rect.y = _tmp21_;
-#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = lower_right;
-#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.x;
-#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = upper_left;
-#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_.x;
-#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	unscaled_rect.width = _tmp23_ - _tmp25_;
-#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = lower_right;
-#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_.y;
-#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = upper_left;
-#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = _tmp28_.y;
-#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	unscaled_rect.height = _tmp27_ - _tmp29_;
-#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = unscaled_rect;
-#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2328 "EditingTools.c"
+#line 2337 "EditingTools.c"
 }
 
 
@@ -2341,43 +2350,43 @@ void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* s
 	gint _tmp7_ = 0;
 	GdkRectangle _tmp8_ = {0};
 	gint _tmp9_ = 0;
-#line 165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (user_point != NULL);
-#line 166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (self, &_tmp0_);
-#line 166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_offsets = _tmp0_;
-#line 168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_.x = 0;
-#line 168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp1_;
-#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *user_point;
-#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = active_offsets;
-#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.x;
-#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.x = _tmp3_ - _tmp5_;
-#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = *user_point;
-#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = active_offsets;
-#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.y;
-#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.y = _tmp7_ - _tmp9_;
-#line 172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
-#line 172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2381 "EditingTools.c"
+#line 2390 "EditingTools.c"
 }
 
 
@@ -2415,101 +2424,101 @@ void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* se
 	gint _tmp27_ = 0;
 	GdkPoint _tmp28_ = {0};
 	gint _tmp29_ = 0;
-#line 175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (user_rect != NULL);
-#line 176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_.x = 0;
-#line 176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left = _tmp0_;
-#line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_.x = 0;
-#line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right = _tmp1_;
-#line 178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *user_rect;
-#line 178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left.x = _tmp3_;
-#line 179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *user_rect;
-#line 179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.y;
-#line 179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left.y = _tmp5_;
-#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = upper_left;
-#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.x;
-#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *user_rect;
-#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.width;
-#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right.x = _tmp7_ + _tmp9_;
-#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = upper_left;
-#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.y;
-#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = *user_rect;
-#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.height;
-#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right.y = _tmp11_ + _tmp13_;
-#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = upper_left;
-#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_user_to_active_point (self, &_tmp14_, &_tmp15_);
-#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left = _tmp15_;
-#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = lower_right;
-#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_user_to_active_point (self, &_tmp16_, &_tmp17_);
-#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right = _tmp17_;
-#line 186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (&active_rect, 0, sizeof (GdkRectangle));
-#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = upper_left;
-#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.x;
-#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_rect.x = _tmp19_;
-#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = upper_left;
-#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_.y;
-#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_rect.y = _tmp21_;
-#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = lower_right;
-#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.x;
-#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = upper_left;
-#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_.x;
-#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_rect.width = _tmp23_ - _tmp25_;
-#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = lower_right;
-#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_.y;
-#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = upper_left;
-#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = _tmp28_.y;
-#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_rect.height = _tmp27_ - _tmp29_;
-#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = active_rect;
-#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2513 "EditingTools.c"
+#line 2522 "EditingTools.c"
 }
 
 
@@ -2517,17 +2526,17 @@ Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) {
 	Photo* result = NULL;
 	Photo* _tmp0_ = NULL;
 	Photo* _tmp1_ = NULL;
-#line 195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->photo;
-#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2531 "EditingTools.c"
+#line 2540 "EditingTools.c"
 }
 
 
@@ -2535,17 +2544,17 @@ GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* se
 	GtkWindow* result = NULL;
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->container;
-#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2549 "EditingTools.c"
+#line 2558 "EditingTools.c"
 }
 
 
@@ -2553,17 +2562,17 @@ GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanva
 	GdkWindow* result = NULL;
 	GdkWindow* _tmp0_ = NULL;
 	GdkWindow* _tmp1_ = NULL;
-#line 203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->drawing_window;
-#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2567 "EditingTools.c"
+#line 2576 "EditingTools.c"
 }
 
 
@@ -2571,48 +2580,48 @@ cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* se
 	cairo_t* result = NULL;
 	cairo_t* _tmp0_ = NULL;
 	cairo_t* _tmp1_ = NULL;
-#line 207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _cairo_reference0 (_tmp0_);
-#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2585 "EditingTools.c"
+#line 2594 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, Dimensions* result) {
 	Dimensions _tmp0_ = {0};
-#line 211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->surface_dim;
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp0_;
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2599 "EditingTools.c"
+#line 2608 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scaling* result) {
 	Dimensions _tmp0_ = {0};
 	Scaling _tmp1_ = {0};
-#line 215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->surface_dim;
-#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaling_for_viewport (&_tmp0_, FALSE, &_tmp1_);
-#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp1_;
-#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2616 "EditingTools.c"
+#line 2625 "EditingTools.c"
 }
 
 
@@ -2622,38 +2631,38 @@ void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cair
 	Dimensions _tmp2_ = {0};
 	cairo_t* _tmp3_ = NULL;
 	Dimensions _tmp4_ = {0};
-#line 219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (default_ctx != NULL);
-#line 219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (surface_dim != NULL);
-#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = default_ctx;
-#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _cairo_reference0 (_tmp0_);
-#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->default_ctx);
-#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->default_ctx = _tmp1_;
-#line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *surface_dim;
-#line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->surface_dim = _tmp2_;
-#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = default_ctx;
-#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *surface_dim;
-#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "new-surface", _tmp3_, &_tmp4_);
-#line 2650 "EditingTools.c"
+#line 2659 "EditingTools.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
-#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 2657 "EditingTools.c"
+#line 2666 "EditingTools.c"
 }
 
 
@@ -2661,17 +2670,17 @@ cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhot
 	cairo_surface_t* result = NULL;
 	cairo_surface_t* _tmp0_ = NULL;
 	cairo_surface_t* _tmp1_ = NULL;
-#line 226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->scaled;
-#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _cairo_surface_reference0 (_tmp0_);
-#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2675 "EditingTools.c"
+#line 2684 "EditingTools.c"
 }
 
 
@@ -2679,31 +2688,31 @@ GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->scaled_pixbuf;
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2693 "EditingTools.c"
+#line 2702 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCanvas* self, GdkRectangle* result) {
 	GdkRectangle _tmp0_ = {0};
-#line 234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->scaled_position;
-#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp0_;
-#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2707 "EditingTools.c"
+#line 2716 "EditingTools.c"
 }
 
 
@@ -2718,65 +2727,65 @@ void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, D
 	Dimensions _tmp7_ = {0};
 	GdkPixbuf* _tmp8_ = NULL;
 	GdkRectangle _tmp9_ = {0};
-#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (scaled));
-#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (scaled_position != NULL);
-#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = scaled;
-#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *scaled_position;
-#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_photo_canvas_pixbuf_to_surface (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->scaled);
-#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled = _tmp3_;
-#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = scaled;
-#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->scaled_pixbuf);
-#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_pixbuf = _tmp5_;
-#line 241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = *scaled_position;
-#line 241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_position = _tmp6_;
-#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = *old_dim;
-#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = scaled;
-#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = *scaled_position;
-#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "resized-scaled-pixbuf", &_tmp7_, _tmp8_, &_tmp9_);
-#line 2762 "EditingTools.c"
+#line 2771 "EditingTools.c"
 }
 
 
 static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* self) {
-#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_critical ("Type `%s' does not implement abstract method `editing_tools_photo_canvas_repaint'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2771 "EditingTools.c"
+#line 2780 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self) {
-#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->repaint (self);
-#line 2780 "EditingTools.c"
+#line 2789 "EditingTools.c"
 }
 
 
@@ -2806,77 +2815,77 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk
 	gint _tmp22_ = 0;
 	cairo_t* _tmp23_ = NULL;
 	cairo_t* _tmp24_ = NULL;
-#line 254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->default_ctx;
-#line 258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->default_ctx;
-#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->surface_dim;
-#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.width;
-#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->surface_dim;
-#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.height;
-#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp2_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp4_, (gdouble) _tmp6_);
-#line 260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->default_ctx;
-#line 260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp7_);
-#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->default_ctx;
-#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = pixbuf;
-#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->scaled_position;
-#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.x;
-#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->scaled_position;
-#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.y;
-#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gdk_cairo_set_source_pixbuf (_tmp8_, _tmp9_, (gdouble) _tmp11_, (gdouble) _tmp13_);
-#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->default_ctx;
-#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->scaled_position;
-#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.x;
-#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->scaled_position;
-#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.y;
-#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = pixbuf;
-#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = gdk_pixbuf_get_width (_tmp19_);
-#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = pixbuf;
-#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = gdk_pixbuf_get_height (_tmp21_);
-#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp14_, (gdouble) _tmp16_, (gdouble) _tmp18_, (gdouble) _tmp20_, (gdouble) _tmp22_);
-#line 266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->default_ctx;
-#line 266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp23_);
-#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->default_ctx;
-#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp24_);
-#line 2880 "EditingTools.c"
+#line 2889 "EditingTools.c"
 }
 
 
@@ -2903,23 +2912,23 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self
 	gint _tmp32_ = 0;
 	cairo_t* _tmp33_ = NULL;
 	cairo_t* _tmp34_ = NULL;
-#line 270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (source_area != NULL);
-#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = pixbuf;
-#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gdk_pixbuf_get_has_alpha (_tmp1_);
-#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_) {
-#line 2923 "EditingTools.c"
+#line 2932 "EditingTools.c"
 		cairo_t* _tmp3_ = NULL;
 		cairo_t* _tmp4_ = NULL;
 		GdkRectangle _tmp5_ = {0};
@@ -2933,87 +2942,87 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
 		cairo_t* _tmp15_ = NULL;
-#line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
-#line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->default_ctx;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->scaled_position;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.x;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = *source_area;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.left;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = self->priv->scaled_position;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = _tmp9_.y;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = *source_area;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = _tmp11_.top;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = box_get_width (source_area);
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = box_get_height (source_area);
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_rectangle (_tmp4_, (gdouble) (_tmp6_ + _tmp8_), (gdouble) (_tmp10_ + _tmp12_), (gdouble) _tmp13_, (gdouble) _tmp14_);
-#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = self->priv->default_ctx;
-#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_fill (_tmp15_);
-#line 2969 "EditingTools.c"
+#line 2978 "EditingTools.c"
 	}
-#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->default_ctx;
-#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = pixbuf;
-#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->scaled_position;
-#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.x;
-#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->scaled_position;
-#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_.y;
-#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gdk_cairo_set_source_pixbuf (_tmp16_, _tmp17_, (gdouble) _tmp19_, (gdouble) _tmp21_);
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->default_ctx;
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->scaled_position;
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = _tmp23_.x;
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = *source_area;
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_.left;
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = self->priv->scaled_position;
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = _tmp27_.y;
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = *source_area;
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_.top;
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = box_get_width (source_area);
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = box_get_height (source_area);
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp22_, (gdouble) (_tmp24_ + _tmp26_), (gdouble) (_tmp28_ + _tmp30_), (gdouble) _tmp31_, (gdouble) _tmp32_);
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->default_ctx;
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp33_);
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = self->priv->default_ctx;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp34_);
-#line 3017 "EditingTools.c"
+#line 3026 "EditingTools.c"
 }
 
 
@@ -3035,74 +3044,74 @@ void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, ca
 	gint _tmp16_ = 0;
 	cairo_t* _tmp17_ = NULL;
 	cairo_t* _tmp18_ = NULL;
-#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (surface != NULL);
-#line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = over;
-#line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == FALSE) {
-#line 3051 "EditingTools.c"
+#line 3060 "EditingTools.c"
 		cairo_t* _tmp2_ = NULL;
-#line 293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->default_ctx;
-#line 293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3057 "EditingTools.c"
+#line 3066 "EditingTools.c"
 	} else {
 		cairo_t* _tmp3_ = NULL;
-#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
-#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3064 "EditingTools.c"
+#line 3073 "EditingTools.c"
 	}
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->default_ctx;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->scaled;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->scaled_position;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.x;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->scaled_position;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.y;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_);
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->default_ctx;
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (_tmp10_);
-#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->default_ctx;
-#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = surface;
-#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->scaled_position;
-#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.x;
-#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->scaled_position;
-#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.y;
-#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp11_, _tmp12_, (gdouble) _tmp14_, (gdouble) _tmp16_);
-#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->default_ctx;
-#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (_tmp17_);
-#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->default_ctx;
-#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp18_);
-#line 3106 "EditingTools.c"
+#line 3115 "EditingTools.c"
 }
 
 
@@ -3146,124 +3155,124 @@ void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* sel
 	gint _tmp38_ = 0;
 	cairo_t* _tmp39_ = NULL;
 	cairo_t* _tmp40_ = NULL;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (surface != NULL);
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (source_area != NULL);
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = over;
-#line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == FALSE) {
-#line 3164 "EditingTools.c"
+#line 3173 "EditingTools.c"
 		cairo_t* _tmp2_ = NULL;
-#line 307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->default_ctx;
-#line 307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3170 "EditingTools.c"
+#line 3179 "EditingTools.c"
 	} else {
 		cairo_t* _tmp3_ = NULL;
-#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
-#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3177 "EditingTools.c"
+#line 3186 "EditingTools.c"
 	}
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->default_ctx;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->scaled;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->scaled_position;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.x;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->scaled_position;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.y;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_);
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->default_ctx;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->scaled_position;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.x;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = *source_area;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.left;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->scaled_position;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.y;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = *source_area;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.top;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = box_get_width (source_area);
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = box_get_height (source_area);
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp10_, (gdouble) (_tmp12_ + _tmp14_), (gdouble) (_tmp16_ + _tmp18_), (gdouble) _tmp19_, (gdouble) _tmp20_);
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->default_ctx;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp21_);
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->default_ctx;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = surface;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->scaled_position;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_.x;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = self->priv->scaled_position;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_.y;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp22_, _tmp23_, (gdouble) _tmp25_, (gdouble) _tmp27_);
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = self->priv->default_ctx;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->scaled_position;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_.x;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = *source_area;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_.left;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->scaled_position;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_.y;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = *source_area;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = _tmp35_.top;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = box_get_width (source_area);
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = box_get_height (source_area);
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp28_, (gdouble) (_tmp30_ + _tmp32_), (gdouble) (_tmp34_ + _tmp36_), (gdouble) _tmp37_, (gdouble) _tmp38_);
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->default_ctx;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp39_);
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = self->priv->default_ctx;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp40_);
-#line 3267 "EditingTools.c"
+#line 3276 "EditingTools.c"
 }
 
 
@@ -3286,57 +3295,57 @@ void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t
 	GdkRectangle _tmp14_ = {0};
 	gint _tmp15_ = 0;
 	cairo_t* _tmp16_ = NULL;
-#line 325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (box != NULL);
-#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_rectangle (box, &_tmp0_);
-#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect = _tmp0_;
-#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = rect.x;
-#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->scaled_position;
-#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect.x = _tmp1_ + _tmp3_;
-#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = rect.y;
-#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->scaled_position;
-#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.y;
-#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect.y = _tmp4_ + _tmp6_;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = rect;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.x;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = rect;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.y;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = rect;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.width;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = rect;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_.height;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp7_, _tmp9_ + 0.5, _tmp11_ + 0.5, (gdouble) (_tmp13_ - 1), (gdouble) (_tmp15_ - 1));
-#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = ctx;
-#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp16_);
-#line 3340 "EditingTools.c"
+#line 3349 "EditingTools.c"
 }
 
 
@@ -3367,106 +3376,106 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
 	cairo_t* _tmp27_ = NULL;
 	cairo_t* _tmp28_ = NULL;
 	const gchar* _tmp29_ = NULL;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (text != NULL);
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = use_scaled_pos;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3381 "EditingTools.c"
+#line 3390 "EditingTools.c"
 		gint _tmp1_ = 0;
 		GdkRectangle _tmp2_ = {0};
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		GdkRectangle _tmp5_ = {0};
 		gint _tmp6_ = 0;
-#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
-#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->scaled_position;
-#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_.x;
-#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = _tmp1_ + _tmp3_;
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = y;
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->scaled_position;
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.y;
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3404 "EditingTools.c"
+#line 3413 "EditingTools.c"
 	}
-#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
-#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = text;
-#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_text_extents (_tmp7_, _tmp8_, &_tmp9_);
-#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	extents = _tmp9_;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = x;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = extents;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.width;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	x = _tmp10_ - (((gint) _tmp12_) / 2);
-#line 343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = ctx;
-#line 343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp13_, RESOURCES_ONIMAGE_FONT_BACKGROUND);
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pane_border = 5;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = ctx;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = x;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = y;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = extents;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.height;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = extents;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_.width;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = extents;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_.height;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp14_, (gdouble) (_tmp15_ - pane_border), (_tmp16_ - pane_border) - _tmp18_, _tmp20_ + (2 * pane_border), _tmp22_ + (2 * pane_border));
-#line 349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = ctx;
-#line 349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp23_);
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = ctx;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = x;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = y;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_move_to (_tmp24_, (gdouble) _tmp25_, (gdouble) _tmp26_);
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = ctx;
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp27_, RESOURCES_ONIMAGE_FONT_COLOR);
-#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = ctx;
-#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = text;
-#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_show_text (_tmp28_, _tmp29_);
-#line 3470 "EditingTools.c"
+#line 3479 "EditingTools.c"
 }
 
 
@@ -3491,62 +3500,62 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
 	gint _tmp12_ = 0;
 	gint _tmp13_ = 0;
 	cairo_t* _tmp14_ = NULL;
-#line 367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = use_scaled_pos;
-#line 368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3503 "EditingTools.c"
+#line 3512 "EditingTools.c"
 		gint _tmp1_ = 0;
 		GdkRectangle _tmp2_ = {0};
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		GdkRectangle _tmp5_ = {0};
 		gint _tmp6_ = 0;
-#line 369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
-#line 369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->scaled_position;
-#line 369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_.x;
-#line 369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = _tmp1_ + _tmp3_;
-#line 370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = y;
-#line 370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->scaled_position;
-#line 370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.y;
-#line 370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3526 "EditingTools.c"
+#line 3535 "EditingTools.c"
 	}
-#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
-#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = x;
-#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = y;
-#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5);
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = ctx;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = x;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = width;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = y;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_line_to (_tmp10_, (gdouble) ((_tmp11_ + _tmp12_) - 1), _tmp13_ + 0.5);
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = ctx;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp14_);
-#line 3550 "EditingTools.c"
+#line 3559 "EditingTools.c"
 }
 
 
@@ -3571,62 +3580,62 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel
 	gint _tmp12_ = 0;
 	gint _tmp13_ = 0;
 	cairo_t* _tmp14_ = NULL;
-#line 389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = use_scaled_pos;
-#line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3583 "EditingTools.c"
+#line 3592 "EditingTools.c"
 		gint _tmp1_ = 0;
 		GdkRectangle _tmp2_ = {0};
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		GdkRectangle _tmp5_ = {0};
 		gint _tmp6_ = 0;
-#line 391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
-#line 391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->scaled_position;
-#line 391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_.x;
-#line 391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = _tmp1_ + _tmp3_;
-#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = y;
-#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->scaled_position;
-#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.y;
-#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3606 "EditingTools.c"
+#line 3615 "EditingTools.c"
 	}
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = x;
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = y;
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5);
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = ctx;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = x;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = y;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = height;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_line_to (_tmp10_, _tmp11_ + 0.5, (gdouble) ((_tmp12_ + _tmp13_) - 1));
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = ctx;
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp14_);
-#line 3630 "EditingTools.c"
+#line 3639 "EditingTools.c"
 }
 
 
@@ -3649,57 +3658,57 @@ void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas*
 	gint _tmp15_ = 0;
 	cairo_t* _tmp16_ = NULL;
 	cairo_t* _tmp17_ = NULL;
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->default_ctx;
-#line 403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE);
-#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->default_ctx;
-#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->scaled;
-#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->scaled_position;
-#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.x;
-#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->scaled_position;
-#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp2_, _tmp3_, (gdouble) _tmp5_, (gdouble) _tmp7_);
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->default_ctx;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->scaled_position;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.x;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = x;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->scaled_position;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.y;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = y;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = width;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) (_tmp15_ - 1), (gdouble) 1);
-#line 407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->default_ctx;
-#line 407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp16_);
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->default_ctx;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp17_);
-#line 3703 "EditingTools.c"
+#line 3712 "EditingTools.c"
 }
 
 
@@ -3715,37 +3724,37 @@ void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cair
 	cairo_t* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	cairo_t* _tmp8_ = NULL;
-#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = active_center_x;
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->scaled_position;
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_.x;
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	center_x = _tmp0_ + _tmp2_;
-#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = active_center_y;
-#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->scaled_position;
-#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.y;
-#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	center_y = _tmp3_ + _tmp5_;
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = ctx;
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = radius;
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_arc (_tmp6_, (gdouble) center_x, (gdouble) center_y, (gdouble) _tmp7_, (gdouble) 0, 2 * G_PI);
-#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = ctx;
-#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp8_);
-#line 3749 "EditingTools.c"
+#line 3758 "EditingTools.c"
 }
 
 
@@ -3768,57 +3777,57 @@ void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* se
 	gint _tmp15_ = 0;
 	cairo_t* _tmp16_ = NULL;
 	cairo_t* _tmp17_ = NULL;
-#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->default_ctx;
-#line 428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE);
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->default_ctx;
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->scaled;
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->scaled_position;
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.x;
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->scaled_position;
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp2_, _tmp3_, (gdouble) _tmp5_, (gdouble) _tmp7_);
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->default_ctx;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->scaled_position;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.x;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = x;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->scaled_position;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.y;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = y;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = height;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) 1, (gdouble) _tmp15_);
-#line 432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->default_ctx;
-#line 432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp16_);
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->default_ctx;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp17_);
-#line 3822 "EditingTools.c"
+#line 3831 "EditingTools.c"
 }
 
 
@@ -3843,59 +3852,59 @@ void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* b
 	Box _tmp17_ = {0};
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
-#line 437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (box != NULL);
-#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *box;
-#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_.left;
-#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *box;
-#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.top;
-#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = box_get_width (box);
-#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_horizontal_line (self, _tmp1_, _tmp3_, _tmp4_);
-#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *box;
-#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.left;
-#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = *box;
-#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.bottom;
-#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = box_get_width (box);
-#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_horizontal_line (self, _tmp6_, _tmp8_, _tmp9_);
-#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = *box;
-#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.left;
-#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = *box;
-#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.top;
-#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = box_get_height (box);
-#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_vertical_line (self, _tmp11_, _tmp13_, _tmp14_);
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = *box;
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.right;
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = *box;
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.top;
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = box_get_height (box);
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_vertical_line (self, _tmp16_, _tmp18_, _tmp19_);
-#line 3899 "EditingTools.c"
+#line 3908 "EditingTools.c"
 }
 
 
@@ -3910,37 +3919,37 @@ void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self,
 	gint _tmp6_ = 0;
 	GdkWindow* _tmp7_ = NULL;
 	GdkRectangle _tmp8_ = {0};
-#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (area != NULL);
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_rectangle (area, &_tmp0_);
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect = _tmp0_;
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = rect.x;
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->scaled_position;
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect.x = _tmp1_ + _tmp3_;
-#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = rect.y;
-#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->scaled_position;
-#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.y;
-#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect.y = _tmp4_ + _tmp6_;
-#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->drawing_window;
-#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = rect;
-#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gdk_window_invalidate_rect (_tmp7_, &_tmp8_, FALSE);
-#line 3944 "EditingTools.c"
+#line 3953 "EditingTools.c"
 }
 
 
@@ -3957,47 +3966,47 @@ static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToo
 	cairo_t* ctx = NULL;
 	cairo_t* _tmp7_ = NULL;
 	GdkPixbuf* _tmp8_ = NULL;
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (default_ctx != NULL, NULL);
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (pos != NULL, NULL);
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = default_ctx;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = cairo_get_target (_tmp0_);
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *pos;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.width;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *pos;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.height;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = cairo_surface_create_similar (_tmp1_, CAIRO_CONTENT_COLOR_ALPHA, _tmp3_, _tmp5_);
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	surface = _tmp6_;
-#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = cairo_create (surface);
-#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	ctx = _tmp7_;
-#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = pixbuf;
-#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gdk_cairo_set_source_pixbuf (ctx, _tmp8_, (gdouble) 0, (gdouble) 0);
-#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (ctx);
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = surface;
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4001 "EditingTools.c"
+#line 4010 "EditingTools.c"
 }
 
 
@@ -4008,27 +4017,27 @@ static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GVa
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = closure->data;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4020 "EditingTools.c"
+#line 4029 "EditingTools.c"
 	} else {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4026 "EditingTools.c"
+#line 4035 "EditingTools.c"
 	}
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__POINTER_BOXED) (marshal_data ? marshal_data : cc->callback);
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_pointer (param_values + 1), g_value_get_boxed (param_values + 2), data2);
-#line 4032 "EditingTools.c"
+#line 4041 "EditingTools.c"
 }
 
 
@@ -4039,255 +4048,255 @@ static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (n_param_values == 4);
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = closure->data;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4051 "EditingTools.c"
+#line 4060 "EditingTools.c"
 	} else {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4057 "EditingTools.c"
+#line 4066 "EditingTools.c"
 	}
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback);
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_boxed (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), data2);
-#line 4063 "EditingTools.c"
+#line 4072 "EditingTools.c"
 }
 
 
 static void editing_tools_value_photo_canvas_init (GValue* value) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 4070 "EditingTools.c"
+#line 4079 "EditingTools.c"
 }
 
 
 static void editing_tools_value_photo_canvas_free_value (GValue* value) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (value->data[0].v_pointer) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (value->data[0].v_pointer);
-#line 4079 "EditingTools.c"
+#line 4088 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (src_value->data[0].v_pointer) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_photo_canvas_ref (src_value->data[0].v_pointer);
-#line 4089 "EditingTools.c"
+#line 4098 "EditingTools.c"
 	} else {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4093 "EditingTools.c"
+#line 4102 "EditingTools.c"
 	}
 }
 
 
 static gpointer editing_tools_value_photo_canvas_peek_pointer (const GValue* value) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4101 "EditingTools.c"
+#line 4110 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_photo_canvas_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 4108 "EditingTools.c"
+#line 4117 "EditingTools.c"
 		EditingToolsPhotoCanvas* object;
 		object = collect_values[0].v_pointer;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4115 "EditingTools.c"
+#line 4124 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4119 "EditingTools.c"
+#line 4128 "EditingTools.c"
 		}
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_photo_canvas_ref (object);
-#line 4123 "EditingTools.c"
+#line 4132 "EditingTools.c"
 	} else {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4127 "EditingTools.c"
+#line 4136 "EditingTools.c"
 	}
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4131 "EditingTools.c"
+#line 4140 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_photo_canvas_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	EditingToolsPhotoCanvas** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4142 "EditingTools.c"
+#line 4151 "EditingTools.c"
 	}
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 4148 "EditingTools.c"
+#line 4157 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4152 "EditingTools.c"
+#line 4161 "EditingTools.c"
 	} else {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4156 "EditingTools.c"
+#line 4165 "EditingTools.c"
 	}
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4160 "EditingTools.c"
+#line 4169 "EditingTools.c"
 }
 
 
 GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	EditingToolsParamSpecPhotoCanvas* spec;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL);
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 4174 "EditingTools.c"
+#line 4183 "EditingTools.c"
 }
 
 
 gpointer editing_tools_value_get_photo_canvas (const GValue* value) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL);
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4183 "EditingTools.c"
+#line 4192 "EditingTools.c"
 }
 
 
 void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) {
 	EditingToolsPhotoCanvas* old;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4203 "EditingTools.c"
+#line 4212 "EditingTools.c"
 	} else {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4207 "EditingTools.c"
+#line 4216 "EditingTools.c"
 	}
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 4213 "EditingTools.c"
+#line 4222 "EditingTools.c"
 	}
 }
 
 
 void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) {
 	EditingToolsPhotoCanvas* old;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 4232 "EditingTools.c"
+#line 4241 "EditingTools.c"
 	} else {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4236 "EditingTools.c"
+#line 4245 "EditingTools.c"
 	}
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 4242 "EditingTools.c"
+#line 4251 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass * klass) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_parent_class = g_type_class_peek_parent (klass);
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsPhotoCanvasClass *) klass)->finalize = editing_tools_photo_canvas_finalize;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsPhotoCanvasPrivate));
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsPhotoCanvasClass *) klass)->repaint = editing_tools_photo_canvas_real_repaint;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#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 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("resized_scaled_pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED, G_TYPE_NONE, 3, TYPE_DIMENSIONS, gdk_pixbuf_get_type (), gdk_rectangle_get_type ());
-#line 4260 "EditingTools.c"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_new ("resized_scaled_pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED, G_TYPE_NONE, 3, TYPE_DIMENSIONS, GDK_TYPE_PIXBUF, GDK_TYPE_RECTANGLE);
+#line 4269 "EditingTools.c"
 }
 
 
 static void editing_tools_photo_canvas_instance_init (EditingToolsPhotoCanvas * self) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_PHOTO_CANVAS_GET_PRIVATE (self);
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 4269 "EditingTools.c"
+#line 4278 "EditingTools.c"
 }
 
 
 static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas* obj) {
 	EditingToolsPhotoCanvas * self;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas);
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_destroy (self);
-#line 99 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->container);
-#line 100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->drawing_window);
-#line 101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->default_ctx);
-#line 104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->scaled);
-#line 105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->scaled_pixbuf);
-#line 4291 "EditingTools.c"
+#line 4300 "EditingTools.c"
 }
 
 
@@ -4308,24 +4317,24 @@ GType editing_tools_photo_canvas_get_type (void) {
 gpointer editing_tools_photo_canvas_ref (gpointer instance) {
 	EditingToolsPhotoCanvas* self;
 	self = instance;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 4316 "EditingTools.c"
+#line 4325 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_unref (gpointer instance) {
 	EditingToolsPhotoCanvas* self;
 	self = instance;
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->finalize (self);
-#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4329 "EditingTools.c"
+#line 4338 "EditingTools.c"
 	}
 }
 
@@ -4334,37 +4343,37 @@ EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type
 	EditingToolsEditingTool* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsEditingTool*) g_type_create_instance (object_type);
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = name;
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->name = _tmp1_;
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 4352 "EditingTools.c"
+#line 4361 "EditingTools.c"
 }
 
 
 static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) {
-#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_photo_canvas_ref (self) : NULL;
-#line 4359 "EditingTools.c"
+#line 4368 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event);
-#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4368 "EditingTools.c"
+#line 4377 "EditingTools.c"
 }
 
 
@@ -4375,54 +4384,54 @@ static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* s
 	EditingToolsPhotoCanvas* _tmp3_ = NULL;
 	EditingToolsEditingToolWindow* _tmp4_ = NULL;
 	EditingToolsEditingToolWindow* _tmp5_ = NULL;
-#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->canvas;
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp0_ == NULL, "this.canvas == null");
-#line 496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->tool_window;
-#line 496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp1_ == NULL, "tool_window == null");
-#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = canvas;
-#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _editing_tools_photo_canvas_ref0 (_tmp2_);
-#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
-#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->canvas = _tmp3_;
-#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = editing_tools_editing_tool_get_tool_window (self);
-#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->tool_window);
-#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->tool_window = _tmp4_;
-#line 501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->tool_window;
-#line 501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ != NULL) {
-#line 4407 "EditingTools.c"
+#line 4416 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp6_ = NULL;
-#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->tool_window;
-#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self);
-#line 4413 "EditingTools.c"
+#line 4422 "EditingTools.c"
 	}
-#line 504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "activated");
-#line 4417 "EditingTools.c"
+#line 4426 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas) {
-#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->activate (self, canvas);
-#line 4426 "EditingTools.c"
+#line 4435 "EditingTools.c"
 }
 
 
@@ -4430,129 +4439,129 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
 	gboolean _tmp0_ = FALSE;
 	EditingToolsPhotoCanvas* _tmp1_ = NULL;
 	EditingToolsEditingToolWindow* _tmp3_ = NULL;
-#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->canvas;
-#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == NULL) {
-#line 4438 "EditingTools.c"
+#line 4447 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp2_ = NULL;
-#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->tool_window;
-#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 4444 "EditingTools.c"
+#line 4453 "EditingTools.c"
 	} else {
-#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 4448 "EditingTools.c"
+#line 4457 "EditingTools.c"
 	}
-#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 4454 "EditingTools.c"
+#line 4463 "EditingTools.c"
 	}
-#line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
-#line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->canvas = NULL;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->tool_window;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_ != NULL) {
-#line 4464 "EditingTools.c"
+#line 4473 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp4_ = NULL;
 		guint _tmp5_ = 0U;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->tool_window;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp5_, NULL, FALSE);
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self);
-#line 517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->tool_window);
-#line 517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tool_window = NULL;
-#line 4477 "EditingTools.c"
+#line 4486 "EditingTools.c"
 	}
-#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "deactivated");
-#line 4481 "EditingTools.c"
+#line 4490 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self) {
-#line 508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->deactivate (self);
-#line 4490 "EditingTools.c"
+#line 4499 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self) {
 	gboolean result = FALSE;
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-#line 523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
-#line 524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->canvas;
-#line 524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_ != NULL;
-#line 524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4505 "EditingTools.c"
+#line 4514 "EditingTools.c"
 }
 
 
 static EditingToolsEditingToolWindow* editing_tools_editing_tool_real_get_tool_window (EditingToolsEditingTool* self) {
 	EditingToolsEditingToolWindow* result = NULL;
-#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = NULL;
-#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4515 "EditingTools.c"
+#line 4524 "EditingTools.c"
 }
 
 
 EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (EditingToolsEditingTool* self) {
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_tool_window (self);
-#line 4524 "EditingTools.c"
+#line 4533 "EditingTools.c"
 }
 
 
 static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) {
 	Dimensions _vala_max_dim = {0};
 	GdkPixbuf* result = NULL;
-#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions_init (&_vala_max_dim, 0, 0);
-#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = NULL;
-#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (max_dim) {
-#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 4543 "EditingTools.c"
+#line 4552 "EditingTools.c"
 	}
-#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4547 "EditingTools.c"
+#line 4556 "EditingTools.c"
 }
 
 
 GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) {
-#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
-#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_display_pixbuf (self, scaling, photo, max_dim, error);
-#line 4556 "EditingTools.c"
+#line 4565 "EditingTools.c"
 }
 
 
@@ -4561,11 +4570,11 @@ static void editing_tools_editing_tool_real_on_left_click (EditingToolsEditingTo
 
 
 void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, gint x, gint y) {
-#line 549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_click (self, x, y);
-#line 4569 "EditingTools.c"
+#line 4578 "EditingTools.c"
 }
 
 
@@ -4574,11 +4583,11 @@ static void editing_tools_editing_tool_real_on_left_released (EditingToolsEditin
 
 
 void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self, gint x, gint y) {
-#line 552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_released (self, x, y);
-#line 4582 "EditingTools.c"
+#line 4591 "EditingTools.c"
 }
 
 
@@ -4587,30 +4596,30 @@ static void editing_tools_editing_tool_real_on_motion (EditingToolsEditingTool*
 
 
 void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask) {
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_motion (self, x, y, mask);
-#line 4595 "EditingTools.c"
+#line 4604 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_editing_tool_real_on_leave_notify_event (EditingToolsEditingTool* self) {
 	gboolean result = FALSE;
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4605 "EditingTools.c"
+#line 4614 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTool* self) {
-#line 558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
-#line 558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_leave_notify_event (self);
-#line 4614 "EditingTools.c"
+#line 4623 "EditingTools.c"
 }
 
 
@@ -4619,63 +4628,63 @@ static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditing
 	GdkEventKey* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
 	const gchar* _tmp2_ = NULL;
-#line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = event;
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_notify_cancel (self);
-#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 4639 "EditingTools.c"
+#line 4648 "EditingTools.c"
 	}
-#line 570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4645 "EditingTools.c"
+#line 4654 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event) {
-#line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
-#line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_keypress (self, event);
-#line 4654 "EditingTools.c"
+#line 4663 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx) {
-#line 573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 4661 "EditingTools.c"
+#line 4670 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* ctx) {
-#line 573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->paint (self, ctx);
-#line 4670 "EditingTools.c"
+#line 4679 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self) {
-#line 577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "cancelled");
-#line 4679 "EditingTools.c"
+#line 4688 "EditingTools.c"
 }
 
 
@@ -4686,279 +4695,279 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (n_param_values == 5);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = closure->data;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4698 "EditingTools.c"
+#line 4707 "EditingTools.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4704 "EditingTools.c"
+#line 4713 "EditingTools.c"
 	}
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 4710 "EditingTools.c"
+#line 4719 "EditingTools.c"
 }
 
 
 static void editing_tools_value_editing_tool_init (GValue* value) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 4717 "EditingTools.c"
+#line 4726 "EditingTools.c"
 }
 
 
 static void editing_tools_value_editing_tool_free_value (GValue* value) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (value->data[0].v_pointer) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (value->data[0].v_pointer);
-#line 4726 "EditingTools.c"
+#line 4735 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_value_editing_tool_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (src_value->data[0].v_pointer) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_editing_tool_ref (src_value->data[0].v_pointer);
-#line 4736 "EditingTools.c"
+#line 4745 "EditingTools.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4740 "EditingTools.c"
+#line 4749 "EditingTools.c"
 	}
 }
 
 
 static gpointer editing_tools_value_editing_tool_peek_pointer (const GValue* value) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4748 "EditingTools.c"
+#line 4757 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_editing_tool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 4755 "EditingTools.c"
+#line 4764 "EditingTools.c"
 		EditingToolsEditingTool* object;
 		object = collect_values[0].v_pointer;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4762 "EditingTools.c"
+#line 4771 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4766 "EditingTools.c"
+#line 4775 "EditingTools.c"
 		}
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_editing_tool_ref (object);
-#line 4770 "EditingTools.c"
+#line 4779 "EditingTools.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4774 "EditingTools.c"
+#line 4783 "EditingTools.c"
 	}
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4778 "EditingTools.c"
+#line 4787 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_editing_tool_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	EditingToolsEditingTool** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4789 "EditingTools.c"
+#line 4798 "EditingTools.c"
 	}
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 4795 "EditingTools.c"
+#line 4804 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4799 "EditingTools.c"
+#line 4808 "EditingTools.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4803 "EditingTools.c"
+#line 4812 "EditingTools.c"
 	}
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4807 "EditingTools.c"
+#line 4816 "EditingTools.c"
 }
 
 
 GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	EditingToolsParamSpecEditingTool* spec;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 4821 "EditingTools.c"
+#line 4830 "EditingTools.c"
 }
 
 
 gpointer editing_tools_value_get_editing_tool (const GValue* value) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4830 "EditingTools.c"
+#line 4839 "EditingTools.c"
 }
 
 
 void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) {
 	EditingToolsEditingTool* old;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4850 "EditingTools.c"
+#line 4859 "EditingTools.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4854 "EditingTools.c"
+#line 4863 "EditingTools.c"
 	}
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4860 "EditingTools.c"
+#line 4869 "EditingTools.c"
 	}
 }
 
 
 void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) {
 	EditingToolsEditingTool* old;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 4879 "EditingTools.c"
+#line 4888 "EditingTools.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4883 "EditingTools.c"
+#line 4892 "EditingTools.c"
 	}
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4889 "EditingTools.c"
+#line 4898 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass * klass) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_parent_class = g_type_class_peek_parent (klass);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_editing_tool_finalize;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsEditingToolPrivate));
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->activate = editing_tools_editing_tool_real_activate;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->deactivate = editing_tools_editing_tool_real_deactivate;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_editing_tool_real_get_tool_window;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = editing_tools_editing_tool_real_get_display_pixbuf;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_click = editing_tools_editing_tool_real_on_left_click;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_released = editing_tools_editing_tool_real_on_left_released;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_motion = editing_tools_editing_tool_real_on_motion;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#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;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_editing_tool_real_on_keypress;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = editing_tools_editing_tool_real_paint;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#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 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_new ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_new ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN, G_TYPE_NONE, 4, TYPE_COMMAND, gdk_pixbuf_get_type (), TYPE_DIMENSIONS, G_TYPE_BOOLEAN);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_new ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN, G_TYPE_NONE, 4, TYPE_COMMAND, GDK_TYPE_PIXBUF, TYPE_DIMENSIONS, G_TYPE_BOOLEAN);
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_new ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_new ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4931 "EditingTools.c"
+#line 4940 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_instance_init (EditingToolsEditingTool * self) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_EDITING_TOOL_GET_PRIVATE (self);
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->canvas = NULL;
-#line 467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->tool_window = NULL;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 4944 "EditingTools.c"
+#line 4953 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_finalize (EditingToolsEditingTool* obj) {
 	EditingToolsEditingTool * self;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_destroy (self);
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
-#line 467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->tool_window);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->surface);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 4962 "EditingTools.c"
+#line 4971 "EditingTools.c"
 }
 
 
@@ -4979,24 +4988,24 @@ GType editing_tools_editing_tool_get_type (void) {
 gpointer editing_tools_editing_tool_ref (gpointer instance) {
 	EditingToolsEditingTool* self;
 	self = instance;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 4987 "EditingTools.c"
+#line 4996 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_unref (gpointer instance) {
 	EditingToolsEditingTool* self;
 	self = instance;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->finalize (self);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5000 "EditingTools.c"
+#line 5009 "EditingTools.c"
 	}
 }
 
@@ -5004,21 +5013,21 @@ void editing_tools_editing_tool_unref (gpointer instance) {
 static EditingToolsCropToolReticleOrientation editing_tools_crop_tool_reticle_orientation_toggle (EditingToolsCropToolReticleOrientation self) {
 	EditingToolsCropToolReticleOrientation result = 0;
 	EditingToolsCropToolReticleOrientation _tmp0_ = 0;
-#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (self == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
-#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT;
-#line 5012 "EditingTools.c"
+#line 5021 "EditingTools.c"
 	} else {
-#line 633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 5016 "EditingTools.c"
+#line 5025 "EditingTools.c"
 	}
-#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5022 "EditingTools.c"
+#line 5031 "EditingTools.c"
 }
 
 
@@ -5048,31 +5057,31 @@ static GType editing_tools_crop_tool_constraint_mode_get_type (void) {
 
 static EditingToolsCropTool* editing_tools_crop_tool_construct (GType object_type) {
 	EditingToolsCropTool* self = NULL;
-#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsCropTool*) editing_tools_editing_tool_construct (object_type, "CropTool");
-#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 5056 "EditingTools.c"
+#line 5065 "EditingTools.c"
 }
 
 
 static EditingToolsCropTool* editing_tools_crop_tool_new (void) {
-#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_construct (EDITING_TOOLS_TYPE_CROP_TOOL);
-#line 5063 "EditingTools.c"
+#line 5072 "EditingTools.c"
 }
 
 
 EditingToolsCropTool* editing_tools_crop_tool_factory (void) {
 	EditingToolsCropTool* result = NULL;
 	EditingToolsCropTool* _tmp0_ = NULL;
-#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_new ();
-#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5076 "EditingTools.c"
+#line 5085 "EditingTools.c"
 }
 
 
@@ -5085,537 +5094,537 @@ gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling) {
 	gboolean _tmp3_ = FALSE;
 	Dimensions _tmp4_ = {0};
 	gint _tmp5_ = 0;
-#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = photo;
-#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_get_original_dimensions (_tmp0_, &_tmp1_);
-#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_);
-#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dim = _tmp2_;
-#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = dim;
-#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.width;
-#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 5107 "EditingTools.c"
+#line 5116 "EditingTools.c"
 		Dimensions _tmp6_ = {0};
 		gint _tmp7_ = 0;
-#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = dim;
-#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_.height;
-#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 5116 "EditingTools.c"
+#line 5125 "EditingTools.c"
 	} else {
-#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 5120 "EditingTools.c"
+#line 5129 "EditingTools.c"
 	}
-#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp3_;
-#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5126 "EditingTools.c"
+#line 5135 "EditingTools.c"
 }
 
 
 static void _vala_array_add4 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if ((*length) == (*size)) {
-#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5137 "EditingTools.c"
-	}
-#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[(*length)++] = value;
-#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[*length] = NULL;
-#line 5143 "EditingTools.c"
-}
-
-
-static void _vala_array_add5 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if ((*length) == (*size)) {
-#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5154 "EditingTools.c"
-	}
-#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[(*length)++] = value;
-#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[*length] = NULL;
-#line 5160 "EditingTools.c"
-}
-
-
-static void _vala_array_add6 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if ((*length) == (*size)) {
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5171 "EditingTools.c"
-	}
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[(*length)++] = value;
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[*length] = NULL;
-#line 5177 "EditingTools.c"
-}
-
-
-static void _vala_array_add7 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if ((*length) == (*size)) {
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5188 "EditingTools.c"
-	}
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[(*length)++] = value;
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[*length] = NULL;
-#line 5194 "EditingTools.c"
-}
-
-
-static void _vala_array_add8 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if ((*length) == (*size)) {
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5205 "EditingTools.c"
-	}
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[(*length)++] = value;
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[*length] = NULL;
-#line 5211 "EditingTools.c"
-}
-
-
-static void _vala_array_add9 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5222 "EditingTools.c"
+#line 5146 "EditingTools.c"
 	}
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5228 "EditingTools.c"
+#line 5152 "EditingTools.c"
 }
 
 
-static void _vala_array_add10 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add5 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5239 "EditingTools.c"
+#line 5163 "EditingTools.c"
 	}
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5245 "EditingTools.c"
+#line 5169 "EditingTools.c"
 }
 
 
-static void _vala_array_add11 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add6 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5256 "EditingTools.c"
+#line 5180 "EditingTools.c"
 	}
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5262 "EditingTools.c"
+#line 5186 "EditingTools.c"
 }
 
 
-static void _vala_array_add12 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add7 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5273 "EditingTools.c"
+#line 5197 "EditingTools.c"
 	}
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5279 "EditingTools.c"
+#line 5203 "EditingTools.c"
 }
 
 
-static void _vala_array_add13 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add8 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5290 "EditingTools.c"
+#line 5214 "EditingTools.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5296 "EditingTools.c"
+#line 5220 "EditingTools.c"
 }
 
 
-static void _vala_array_add14 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add9 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5307 "EditingTools.c"
+#line 5231 "EditingTools.c"
 	}
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5313 "EditingTools.c"
+#line 5237 "EditingTools.c"
 }
 
 
-static void _vala_array_add15 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add10 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5324 "EditingTools.c"
+#line 5248 "EditingTools.c"
 	}
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5330 "EditingTools.c"
+#line 5254 "EditingTools.c"
 }
 
 
-static void _vala_array_add16 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add11 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5341 "EditingTools.c"
+#line 5265 "EditingTools.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5347 "EditingTools.c"
+#line 5271 "EditingTools.c"
 }
 
 
-static void _vala_array_add17 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add12 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5358 "EditingTools.c"
+#line 5282 "EditingTools.c"
 	}
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5364 "EditingTools.c"
+#line 5288 "EditingTools.c"
 }
 
 
-static void _vala_array_add18 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add13 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5375 "EditingTools.c"
+#line 5299 "EditingTools.c"
 	}
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5381 "EditingTools.c"
+#line 5305 "EditingTools.c"
 }
 
 
-static void _vala_array_add19 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add14 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5392 "EditingTools.c"
+#line 5316 "EditingTools.c"
 	}
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5398 "EditingTools.c"
+#line 5322 "EditingTools.c"
 }
 
 
-static void _vala_array_add20 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add15 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5409 "EditingTools.c"
+#line 5333 "EditingTools.c"
 	}
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5415 "EditingTools.c"
+#line 5339 "EditingTools.c"
 }
 
 
-static void _vala_array_add21 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add16 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5426 "EditingTools.c"
+#line 5350 "EditingTools.c"
 	}
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5432 "EditingTools.c"
+#line 5356 "EditingTools.c"
 }
 
 
-static void _vala_array_add22 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add17 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5443 "EditingTools.c"
+#line 5367 "EditingTools.c"
 	}
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5449 "EditingTools.c"
+#line 5373 "EditingTools.c"
 }
 
 
-static void _vala_array_add23 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add18 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5460 "EditingTools.c"
+#line 5384 "EditingTools.c"
 	}
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5466 "EditingTools.c"
+#line 5390 "EditingTools.c"
 }
 
 
-static void _vala_array_add24 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add19 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5477 "EditingTools.c"
+#line 5401 "EditingTools.c"
 	}
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5483 "EditingTools.c"
+#line 5407 "EditingTools.c"
 }
 
 
-static void _vala_array_add25 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add20 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5494 "EditingTools.c"
+#line 5418 "EditingTools.c"
 	}
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5500 "EditingTools.c"
+#line 5424 "EditingTools.c"
 }
 
 
-static void _vala_array_add26 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add21 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5511 "EditingTools.c"
+#line 5435 "EditingTools.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5517 "EditingTools.c"
+#line 5441 "EditingTools.c"
 }
 
 
-static void _vala_array_add27 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add22 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5528 "EditingTools.c"
+#line 5452 "EditingTools.c"
 	}
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5534 "EditingTools.c"
+#line 5458 "EditingTools.c"
 }
 
 
-static void _vala_array_add28 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add23 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5545 "EditingTools.c"
+#line 5469 "EditingTools.c"
 	}
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5551 "EditingTools.c"
+#line 5475 "EditingTools.c"
 }
 
 
-static void _vala_array_add29 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add24 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5562 "EditingTools.c"
+#line 5486 "EditingTools.c"
 	}
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5568 "EditingTools.c"
+#line 5492 "EditingTools.c"
 }
 
 
-static void _vala_array_add30 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add25 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5579 "EditingTools.c"
+#line 5503 "EditingTools.c"
 	}
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5585 "EditingTools.c"
+#line 5509 "EditingTools.c"
 }
 
 
-static void _vala_array_add31 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add26 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5596 "EditingTools.c"
+#line 5520 "EditingTools.c"
 	}
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5602 "EditingTools.c"
+#line 5526 "EditingTools.c"
 }
 
 
-static void _vala_array_add32 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add27 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5613 "EditingTools.c"
+#line 5537 "EditingTools.c"
 	}
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5619 "EditingTools.c"
+#line 5543 "EditingTools.c"
+}
+
+
+static void _vala_array_add28 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if ((*length) == (*size)) {
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
+#line 5554 "EditingTools.c"
+	}
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[(*length)++] = value;
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[*length] = NULL;
+#line 5560 "EditingTools.c"
+}
+
+
+static void _vala_array_add29 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if ((*length) == (*size)) {
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
+#line 5571 "EditingTools.c"
+	}
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[(*length)++] = value;
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[*length] = NULL;
+#line 5577 "EditingTools.c"
+}
+
+
+static void _vala_array_add30 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if ((*length) == (*size)) {
+#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
+#line 5588 "EditingTools.c"
+	}
+#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[(*length)++] = value;
+#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[*length] = NULL;
+#line 5594 "EditingTools.c"
+}
+
+
+static void _vala_array_add31 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if ((*length) == (*size)) {
+#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
+#line 5605 "EditingTools.c"
+	}
+#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[(*length)++] = value;
+#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[*length] = NULL;
+#line 5611 "EditingTools.c"
+}
+
+
+static void _vala_array_add32 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if ((*length) == (*size)) {
+#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
+#line 5622 "EditingTools.c"
+	}
+#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[(*length)++] = value;
+#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[*length] = NULL;
+#line 5628 "EditingTools.c"
 }
 
 
@@ -5743,326 +5752,326 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 	EditingToolsCropToolConstraintDescription* _tmp87_ = NULL;
 	EditingToolsCropToolConstraintDescription** _tmp88_ = NULL;
 	gint _tmp88__length1 = 0;
-#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = g_new0 (EditingToolsCropToolConstraintDescription*, 0 + 1);
-#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp0_;
-#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result__length1 = 0;
-#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	__result__size_ = _result__length1;
-#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _result_;
-#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1__length1 = _result__length1;
-#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _ ("Unconstrained");
-#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_crop_tool_constraint_description_new (_tmp2_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO);
-#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add4 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _result_;
-#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4__length1 = _result__length1;
-#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _ ("Square");
-#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = editing_tools_crop_tool_constraint_description_new (_tmp5_, 1, 1, FALSE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add5 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _result_;
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7__length1 = _result__length1;
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _ ("Screen");
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = editing_tools_crop_tool_constraint_description_new (_tmp8_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO);
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _result_;
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10__length1 = _result__length1;
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _ ("Original Size");
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = editing_tools_crop_tool_constraint_description_new (_tmp11_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO);
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _result_;
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13__length1 = _result__length1;
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _ ("-");
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = editing_tools_crop_tool_constraint_description_new (_tmp14_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _result_;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16__length1 = _result__length1;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _ ("SD Video (4 ∶ 3)");
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = editing_tools_crop_tool_constraint_description_new (_tmp17_, 4, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp18_);
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _result_;
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19__length1 = _result__length1;
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _ ("HD Video (16 ∶ 9)");
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = editing_tools_crop_tool_constraint_description_new (_tmp20_, 16, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, _tmp21_);
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _result_;
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22__length1 = _result__length1;
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _ ("-");
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = editing_tools_crop_tool_constraint_description_new (_tmp23_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, _tmp24_);
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _result_;
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25__length1 = _result__length1;
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _ ("Wallet (2 × 3 in.)");
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = editing_tools_crop_tool_constraint_description_new (_tmp26_, 3, 2, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp27_);
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = _result_;
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28__length1 = _result__length1;
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = _ ("Notecard (3 × 5 in.)");
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = editing_tools_crop_tool_constraint_description_new (_tmp29_, 5, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp30_);
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = _result_;
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31__length1 = _result__length1;
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _ ("4 × 6 in.");
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = editing_tools_crop_tool_constraint_description_new (_tmp32_, 6, 4, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp33_);
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _result_;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34__length1 = _result__length1;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = _ ("5 × 7 in.");
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = editing_tools_crop_tool_constraint_description_new (_tmp35_, 7, 5, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp36_);
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = _result_;
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37__length1 = _result__length1;
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = _ ("8 × 10 in.");
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = editing_tools_crop_tool_constraint_description_new (_tmp38_, 10, 8, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp39_);
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = _result_;
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40__length1 = _result__length1;
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = _ ("Letter (8.5 × 11 in.)");
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = editing_tools_crop_tool_constraint_description_new (_tmp41_, 85, 110, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp42_);
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = _result_;
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43__length1 = _result__length1;
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp44_ = _ ("11 × 14 in.");
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = editing_tools_crop_tool_constraint_description_new (_tmp44_, 14, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp45_);
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = _result_;
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46__length1 = _result__length1;
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp47_ = _ ("Tabloid (11 × 17 in.)");
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp48_ = editing_tools_crop_tool_constraint_description_new (_tmp47_, 17, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp48_);
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49_ = _result_;
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49__length1 = _result__length1;
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp50_ = _ ("16 × 20 in.");
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp51_ = editing_tools_crop_tool_constraint_description_new (_tmp50_, 20, 16, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp51_);
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp52_ = _result_;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp52__length1 = _result__length1;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp53_ = _ ("-");
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp54_ = editing_tools_crop_tool_constraint_description_new (_tmp53_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp54_);
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp55_ = _result_;
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp55__length1 = _result__length1;
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp56_ = _ ("Metric Wallet (9 × 13 cm)");
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp57_ = editing_tools_crop_tool_constraint_description_new (_tmp56_, 13, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp57_);
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp58_ = _result_;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp58__length1 = _result__length1;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp59_ = _ ("Postcard (10 × 15 cm)");
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp60_ = editing_tools_crop_tool_constraint_description_new (_tmp59_, 15, 10, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp60_);
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp61_ = _result_;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp61__length1 = _result__length1;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp62_ = _ ("13 × 18 cm");
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp63_ = editing_tools_crop_tool_constraint_description_new (_tmp62_, 18, 13, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp63_);
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp64_ = _result_;
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp64__length1 = _result__length1;
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = _ ("18 × 24 cm");
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp66_ = editing_tools_crop_tool_constraint_description_new (_tmp65_, 24, 18, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp66_);
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = _result_;
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67__length1 = _result__length1;
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = _ ("A4 (210 × 297 mm)");
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = editing_tools_crop_tool_constraint_description_new (_tmp68_, 210, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp69_);
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = _result_;
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70__length1 = _result__length1;
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = _ ("20 × 30 cm");
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp72_ = editing_tools_crop_tool_constraint_description_new (_tmp71_, 30, 20, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp72_);
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp73_ = _result_;
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp73__length1 = _result__length1;
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp74_ = _ ("24 × 40 cm");
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp75_ = editing_tools_crop_tool_constraint_description_new (_tmp74_, 40, 24, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp75_);
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp76_ = _result_;
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp76__length1 = _result__length1;
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp77_ = _ ("30 × 40 cm");
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp78_ = editing_tools_crop_tool_constraint_description_new (_tmp77_, 40, 30, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp78_);
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp79_ = _result_;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp79__length1 = _result__length1;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp80_ = _ ("A3 (297 × 420 mm)");
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp81_ = editing_tools_crop_tool_constraint_description_new (_tmp80_, 420, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp81_);
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp82_ = _result_;
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp82__length1 = _result__length1;
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp83_ = _ ("-");
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp84_ = editing_tools_crop_tool_constraint_description_new (_tmp83_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp84_);
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp85_ = _result_;
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp85__length1 = _result__length1;
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp86_ = _ ("Custom");
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp87_ = editing_tools_crop_tool_constraint_description_new (_tmp86_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO);
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp87_);
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp88_ = _result_;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp88__length1 = _result__length1;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (result_length1) {
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*result_length1 = _tmp88__length1;
-#line 6053 "EditingTools.c"
+#line 6062 "EditingTools.c"
 	}
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp88_;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6059 "EditingTools.c"
+#line 6068 "EditingTools.c"
 }
 
 
 static gpointer _editing_tools_crop_tool_constraint_description_ref0 (gpointer self) {
-#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_crop_tool_constraint_description_ref (self) : NULL;
-#line 6066 "EditingTools.c"
+#line 6075 "EditingTools.c"
 }
 
 
@@ -6073,34 +6082,34 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 	GtkTreeIter iter = {0};
 	EditingToolsCropToolConstraintDescription** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = gtk_list_store_new (1, G_TYPE_STRING, G_TYPE_STRING, -1);
-#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp0_;
-#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = constraint_data;
-#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1__length1 = constraint_data_length1;
-#line 6085 "EditingTools.c"
+#line 6094 "EditingTools.c"
 	{
 		EditingToolsCropToolConstraintDescription** constraint_collection = NULL;
 		gint constraint_collection_length1 = 0;
 		gint _constraint_collection_size_ = 0;
 		gint constraint_it = 0;
-#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		constraint_collection = _tmp1_;
-#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		constraint_collection_length1 = _tmp1__length1;
-#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		for (constraint_it = 0; constraint_it < _tmp1__length1; constraint_it = constraint_it + 1) {
-#line 6097 "EditingTools.c"
+#line 6106 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp2_ = NULL;
 			EditingToolsCropToolConstraintDescription* constraint = NULL;
-#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = _editing_tools_crop_tool_constraint_description_ref0 (constraint_collection[constraint_it]);
-#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			constraint = _tmp2_;
-#line 6104 "EditingTools.c"
+#line 6113 "EditingTools.c"
 			{
 				GtkListStore* _tmp3_ = NULL;
 				GtkTreeIter _tmp4_ = {0};
@@ -6109,39 +6118,39 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 				EditingToolsCropToolConstraintDescription* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
 				GValue _tmp9_ = {0};
-#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp3_ = _result_;
-#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				gtk_list_store_append (_tmp3_, &_tmp4_);
-#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				iter = _tmp4_;
-#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp5_ = _result_;
-#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp6_ = iter;
-#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp7_ = constraint;
-#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp8_ = _tmp7_->name;
-#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				g_value_init (&_tmp9_, G_TYPE_STRING);
-#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				g_value_set_string (&_tmp9_, _tmp8_);
-#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				gtk_list_store_set_value (_tmp5_, &_tmp6_, 0, &_tmp9_);
-#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				G_IS_VALUE (&_tmp9_) ? (g_value_unset (&_tmp9_), NULL) : NULL;
-#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_editing_tools_crop_tool_constraint_description_unref0 (constraint);
-#line 6137 "EditingTools.c"
+#line 6146 "EditingTools.c"
 			}
 		}
 	}
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6145 "EditingTools.c"
+#line 6154 "EditingTools.c"
 }
 
 
@@ -6151,23 +6160,23 @@ static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropT
 	EditingToolsCropToolConstraintDescription* _tmp2_ = NULL;
 	EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->pivot_reticle_button;
-#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->is_pivotable;
-#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _tmp4_);
-#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp3_);
-#line 6171 "EditingTools.c"
+#line 6180 "EditingTools.c"
 }
 
 
@@ -6183,31 +6192,31 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 	EditingToolsCropToolConstraintDescription* _tmp5_ = NULL;
 	EditingToolsCropToolConstraintDescription* _tmp6_ = NULL;
 	gfloat _tmp7_ = 0.0F;
-#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->constraints;
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0__length1 = self->priv->constraints_length1;
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->constraint_combo;
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gtk_combo_box_get_active (_tmp2_);
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp0_[_tmp3_];
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp4_);
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp5_;
-#line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _result_;
-#line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->aspect_ratio;
-#line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp7_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6211 "EditingTools.c"
+#line 6220 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* _tmp8_ = NULL;
 		EditingToolsPhotoCanvas* _tmp9_ = NULL;
 		GdkRectangle _tmp10_ = {0};
@@ -6216,37 +6225,37 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 		EditingToolsPhotoCanvas* _tmp13_ = NULL;
 		GdkRectangle _tmp14_ = {0};
 		gint _tmp15_ = 0;
-#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _result_;
-#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp9_, &_tmp10_);
-#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _tmp10_.width;
-#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_->basis_width = _tmp11_;
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = _result_;
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp13_, &_tmp14_);
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = _tmp14_.height;
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_->basis_height = _tmp15_;
-#line 6240 "EditingTools.c"
+#line 6249 "EditingTools.c"
 	} else {
 		EditingToolsCropToolConstraintDescription* _tmp16_ = NULL;
 		gfloat _tmp17_ = 0.0F;
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _result_;
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp16_->aspect_ratio;
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp17_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 6250 "EditingTools.c"
+#line 6259 "EditingTools.c"
 			GdkScreen* screen = NULL;
 			GdkScreen* _tmp18_ = NULL;
 			GdkScreen* _tmp19_ = NULL;
@@ -6256,38 +6265,38 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 			EditingToolsCropToolConstraintDescription* _tmp23_ = NULL;
 			GdkScreen* _tmp24_ = NULL;
 			gint _tmp25_ = 0;
-#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = gdk_screen_get_default ();
-#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			screen = _tmp19_;
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = _result_;
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp21_ = screen;
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp22_ = gdk_screen_get_width (_tmp21_);
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_->basis_width = _tmp22_;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp23_ = _result_;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp24_ = screen;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp25_ = gdk_screen_get_height (_tmp24_);
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp23_->basis_height = _tmp25_;
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 6284 "EditingTools.c"
+#line 6293 "EditingTools.c"
 		}
 	}
-#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
-#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6291 "EditingTools.c"
+#line 6300 "EditingTools.c"
 }
 
 
@@ -6299,31 +6308,31 @@ static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCr
 	GtkEntry* _tmp3_ = NULL;
 	GdkEventFocus* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->custom_width_entry;
-#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp0_->most_recently_edited);
-#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_->most_recently_edited = _tmp3_;
-#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = event;
-#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_);
-#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp5_;
-#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6327 "EditingTools.c"
+#line 6336 "EditingTools.c"
 }
 
 
@@ -6335,31 +6344,31 @@ static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsC
 	GtkEntry* _tmp3_ = NULL;
 	GdkEventFocus* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->custom_height_entry;
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp0_->most_recently_edited);
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_->most_recently_edited = _tmp3_;
-#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = event;
-#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_);
-#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp5_;
-#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6363 "EditingTools.c"
+#line 6372 "EditingTools.c"
 }
 
 
@@ -6397,170 +6406,170 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	EditingToolsPhotoCanvas* _tmp71_ = NULL;
 	gint _tmp72_ = 0;
 	gint _tmp73_ = 0;
-#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->custom_width_entry;
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = atoi (_tmp3_);
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	width = _tmp4_;
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->crop_tool_window;
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->custom_height_entry;
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = gtk_entry_get_text (_tmp6_);
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_;
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = atoi (_tmp8_);
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	height = _tmp9_;
-#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = width;
-#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ < 1) {
-#line 6433 "EditingTools.c"
+#line 6442 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp11_ = NULL;
 		GtkEntry* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		width = 1;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = self->priv->crop_tool_window;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = _tmp11_->custom_width_entry;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = width;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = g_strdup_printf ("%d", _tmp13_);
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = _tmp14_;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp12_, _tmp15_);
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp15_);
-#line 6455 "EditingTools.c"
+#line 6464 "EditingTools.c"
 	}
-#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = height;
-#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp16_ < 1) {
-#line 6461 "EditingTools.c"
+#line 6470 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp17_ = NULL;
 		GtkEntry* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		height = 1;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = self->priv->crop_tool_window;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = _tmp17_->custom_height_entry;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = height;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = g_strdup_printf ("%d", _tmp19_);
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = _tmp20_;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp18_, _tmp21_);
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp21_);
-#line 6483 "EditingTools.c"
+#line 6492 "EditingTools.c"
 	}
-#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = width;
-#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->custom_width;
-#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp23_ == _tmp24_) {
-#line 6491 "EditingTools.c"
+#line 6500 "EditingTools.c"
 		gint _tmp25_ = 0;
 		gint _tmp26_ = 0;
-#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = height;
-#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = self->priv->custom_height;
-#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = _tmp25_ == _tmp26_;
-#line 6500 "EditingTools.c"
+#line 6509 "EditingTools.c"
 	} else {
-#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = FALSE;
-#line 6504 "EditingTools.c"
+#line 6513 "EditingTools.c"
 	}
-#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp22_) {
-#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 6512 "EditingTools.c"
+#line 6521 "EditingTools.c"
 	}
-#line 841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = width;
-#line 841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = height;
-#line 841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_aspect_ratio = ((gfloat) _tmp27_) / ((gfloat) _tmp28_);
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->custom_aspect_ratio;
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp29_ < EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO) {
-#line 6524 "EditingTools.c"
+#line 6533 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp30_ = NULL;
 		GtkEntry* _tmp31_ = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp32_ = NULL;
 		GtkEntry* _tmp33_ = NULL;
-#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp30_ = self->priv->crop_tool_window;
-#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = _tmp30_->most_recently_edited;
-#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp32_ = self->priv->crop_tool_window;
-#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp33_ = _tmp32_->custom_height_entry;
-#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp31_ == _tmp33_) {
-#line 6539 "EditingTools.c"
+#line 6548 "EditingTools.c"
 			gint _tmp34_ = 0;
 			EditingToolsCropToolCropToolWindow* _tmp35_ = NULL;
 			GtkEntry* _tmp36_ = NULL;
 			gint _tmp37_ = 0;
 			gchar* _tmp38_ = NULL;
 			gchar* _tmp39_ = NULL;
-#line 845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = width;
-#line 845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			height = (gint) (_tmp34_ / EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO);
-#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp35_ = self->priv->crop_tool_window;
-#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp36_ = _tmp35_->custom_height_entry;
-#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp37_ = height;
-#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp38_ = g_strdup_printf ("%d", _tmp37_);
-#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp39_ = _tmp38_;
-#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_entry_set_text (_tmp36_, _tmp39_);
-#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_free0 (_tmp39_);
-#line 6564 "EditingTools.c"
+#line 6573 "EditingTools.c"
 		} else {
 			gint _tmp40_ = 0;
 			EditingToolsCropToolCropToolWindow* _tmp41_ = NULL;
@@ -6568,73 +6577,73 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 			gint _tmp43_ = 0;
 			gchar* _tmp44_ = NULL;
 			gchar* _tmp45_ = NULL;
-#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp40_ = height;
-#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			width = (gint) (_tmp40_ * EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO);
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp41_ = self->priv->crop_tool_window;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp42_ = _tmp41_->custom_width_entry;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp43_ = width;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp44_ = g_strdup_printf ("%d", _tmp43_);
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp45_ = _tmp44_;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_entry_set_text (_tmp42_, _tmp45_);
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_free0 (_tmp45_);
-#line 6590 "EditingTools.c"
+#line 6599 "EditingTools.c"
 		}
 	} else {
 		gfloat _tmp46_ = 0.0F;
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = self->priv->custom_aspect_ratio;
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp46_ > EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO) {
-#line 6598 "EditingTools.c"
+#line 6607 "EditingTools.c"
 			EditingToolsCropToolCropToolWindow* _tmp47_ = NULL;
 			GtkEntry* _tmp48_ = NULL;
 			EditingToolsCropToolCropToolWindow* _tmp49_ = NULL;
 			GtkEntry* _tmp50_ = NULL;
-#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp47_ = self->priv->crop_tool_window;
-#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp48_ = _tmp47_->most_recently_edited;
-#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp49_ = self->priv->crop_tool_window;
-#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp50_ = _tmp49_->custom_height_entry;
-#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp48_ == _tmp50_) {
-#line 6613 "EditingTools.c"
+#line 6622 "EditingTools.c"
 				gint _tmp51_ = 0;
 				EditingToolsCropToolCropToolWindow* _tmp52_ = NULL;
 				GtkEntry* _tmp53_ = NULL;
 				gint _tmp54_ = 0;
 				gchar* _tmp55_ = NULL;
 				gchar* _tmp56_ = NULL;
-#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp51_ = width;
-#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				height = (gint) (_tmp51_ / EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO);
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp52_ = self->priv->crop_tool_window;
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp53_ = _tmp52_->custom_height_entry;
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp54_ = height;
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp55_ = g_strdup_printf ("%d", _tmp54_);
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp56_ = _tmp55_;
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				gtk_entry_set_text (_tmp53_, _tmp56_);
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_g_free0 (_tmp56_);
-#line 6638 "EditingTools.c"
+#line 6647 "EditingTools.c"
 			} else {
 				gint _tmp57_ = 0;
 				EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
@@ -6642,71 +6651,71 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 				gint _tmp60_ = 0;
 				gchar* _tmp61_ = NULL;
 				gchar* _tmp62_ = NULL;
-#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp57_ = height;
-#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				width = (gint) (_tmp57_ * EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO);
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp58_ = self->priv->crop_tool_window;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp59_ = _tmp58_->custom_width_entry;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp60_ = width;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp61_ = g_strdup_printf ("%d", _tmp60_);
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp62_ = _tmp61_;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				gtk_entry_set_text (_tmp59_, _tmp62_);
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_g_free0 (_tmp62_);
-#line 6664 "EditingTools.c"
+#line 6673 "EditingTools.c"
 			}
 		}
 	}
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp63_ = width;
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp64_ = height;
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_aspect_ratio = ((gfloat) _tmp63_) / ((gfloat) _tmp64_);
-#line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = self->priv->scaled_crop;
-#line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constrain_crop (self, &_tmp65_, &_tmp66_);
-#line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_crop = _tmp66_;
-#line 865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = new_crop;
-#line 865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_crop_resized (self, &_tmp67_);
-#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = new_crop;
-#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_crop = _tmp68_;
-#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = new_crop;
-#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp69_, &_tmp70_);
-#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp71_);
-#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp72_ = width;
-#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_width = _tmp72_;
-#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp73_ = height;
-#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_height = _tmp73_;
-#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6710 "EditingTools.c"
+#line 6719 "EditingTools.c"
 }
 
 
@@ -6715,21 +6724,21 @@ static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool*
 	GtkEntry* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-#line 876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (text != NULL);
-#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->custom_width_entry;
-#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = text;
-#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = length;
-#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6733 "EditingTools.c"
+#line 6742 "EditingTools.c"
 }
 
 
@@ -6738,21 +6747,21 @@ static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool*
 	GtkEntry* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (text != NULL);
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->custom_height_entry;
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = text;
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = length;
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6756 "EditingTools.c"
+#line 6765 "EditingTools.c"
 }
 
 
@@ -6760,17 +6769,17 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 6774 "EditingTools.c"
+#line 6783 "EditingTools.c"
 }
 
 
@@ -6783,96 +6792,96 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	gint _tmp22_ = 0;
 	gint _tmp23_ = 0;
 	GtkEntry* _tmp29_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GTK_IS_ENTRY (sender));
-#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (text != NULL);
-#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->entry_insert_in_progress;
-#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 6799 "EditingTools.c"
+#line 6808 "EditingTools.c"
 	}
-#line 888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->entry_insert_in_progress = TRUE;
-#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = length;
-#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == -1) {
-#line 6807 "EditingTools.c"
+#line 6816 "EditingTools.c"
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = text;
-#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = strlen (_tmp2_);
-#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = _tmp3_;
-#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		length = (gint) _tmp4_;
-#line 6819 "EditingTools.c"
+#line 6828 "EditingTools.c"
 	}
-#line 894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = g_strdup ("");
-#line 894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_text = _tmp5_;
-#line 6825 "EditingTools.c"
+#line 6834 "EditingTools.c"
 	{
 		gint ctr = 0;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		ctr = 0;
-#line 6830 "EditingTools.c"
+#line 6839 "EditingTools.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = TRUE;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 6837 "EditingTools.c"
+#line 6846 "EditingTools.c"
 				gint _tmp8_ = 0;
 				gint _tmp9_ = 0;
 				const gchar* _tmp10_ = NULL;
 				gint _tmp11_ = 0;
 				gchar _tmp12_ = '\0';
 				gboolean _tmp13_ = FALSE;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!_tmp6_) {
-#line 6846 "EditingTools.c"
+#line 6855 "EditingTools.c"
 					gint _tmp7_ = 0;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp7_ = ctr;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					ctr = _tmp7_ + 1;
-#line 6852 "EditingTools.c"
+#line 6861 "EditingTools.c"
 				}
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp6_ = FALSE;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp8_ = ctr;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp9_ = length;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!(_tmp8_ < _tmp9_)) {
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 6864 "EditingTools.c"
+#line 6873 "EditingTools.c"
 				}
-#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp10_ = text;
-#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp11_ = ctr;
-#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp12_ = string_get (_tmp10_, (glong) _tmp11_);
-#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp13_ = g_ascii_isdigit (_tmp12_);
-#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp13_) {
-#line 6876 "EditingTools.c"
+#line 6885 "EditingTools.c"
 					const gchar* _tmp14_ = NULL;
 					const gchar* _tmp15_ = NULL;
 					gint _tmp16_ = 0;
@@ -6880,68 +6889,68 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 					gchar* _tmp18_ = NULL;
 					gchar* _tmp19_ = NULL;
 					gchar* _tmp20_ = NULL;
-#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp14_ = new_text;
-#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp15_ = text;
-#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp16_ = ctr;
-#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp17_ = string_get (_tmp15_, (glong) _tmp16_);
-#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp18_ = g_strdup_printf ("%c", (gchar) _tmp17_);
-#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp19_ = _tmp18_;
-#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp20_ = g_strconcat (_tmp14_, _tmp19_, NULL);
-#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_g_free0 (new_text);
-#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_text = _tmp20_;
-#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_g_free0 (_tmp19_);
-#line 6904 "EditingTools.c"
+#line 6913 "EditingTools.c"
 				}
 			}
 		}
 	}
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = new_text;
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = strlen (_tmp21_);
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_;
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp23_ > 0) {
-#line 6917 "EditingTools.c"
+#line 6926 "EditingTools.c"
 		GtkEntry* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
 		gint _tmp27_ = 0;
 		gint _tmp28_ = 0;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = sender;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = new_text;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = new_text;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = strlen (_tmp26_);
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = _tmp27_;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 6935 "EditingTools.c"
+#line 6944 "EditingTools.c"
 	}
-#line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = sender;
-#line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_stop_emission_by_name (_tmp29_, "insert-text");
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->entry_insert_in_progress = FALSE;
-#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (new_text);
-#line 6945 "EditingTools.c"
+#line 6954 "EditingTools.c"
 }
 
 
@@ -6954,53 +6963,53 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 	gfloat _tmp3_ = 0.0F;
 	gfloat _tmp4_ = 0.0F;
 	EditingToolsCropToolReticleOrientation _tmp20_ = 0;
-#line 909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
-#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->aspect_ratio;
-#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp1_);
-#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp3_;
-#line 912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _result_;
-#line 912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6976 "EditingTools.c"
+#line 6985 "EditingTools.c"
 		EditingToolsPhotoCanvas* _tmp5_ = NULL;
 		GdkRectangle _tmp6_ = {0};
 		gint _tmp7_ = 0;
 		EditingToolsPhotoCanvas* _tmp8_ = NULL;
 		GdkRectangle _tmp9_ = {0};
 		gint _tmp10_ = 0;
-#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp5_, &_tmp6_);
-#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_.width;
-#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_);
-#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = _tmp9_.height;
-#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = ((gfloat) _tmp7_) / ((gfloat) _tmp10_);
-#line 6997 "EditingTools.c"
+#line 7006 "EditingTools.c"
 	} else {
 		gfloat _tmp11_ = 0.0F;
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _result_;
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp11_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 7004 "EditingTools.c"
+#line 7013 "EditingTools.c"
 			GdkScreen* screen = NULL;
 			GdkScreen* _tmp12_ = NULL;
 			GdkScreen* _tmp13_ = NULL;
@@ -7008,58 +7017,58 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 			gint _tmp15_ = 0;
 			GdkScreen* _tmp16_ = NULL;
 			gint _tmp17_ = 0;
-#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp12_ = gdk_screen_get_default ();
-#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			screen = _tmp13_;
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = screen;
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp15_ = gdk_screen_get_width (_tmp14_);
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp16_ = screen;
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp17_ = gdk_screen_get_height (_tmp16_);
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_result_ = ((gfloat) _tmp15_) / ((gfloat) _tmp17_);
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 7030 "EditingTools.c"
+#line 7039 "EditingTools.c"
 		} else {
 			gfloat _tmp18_ = 0.0F;
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = _result_;
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 7037 "EditingTools.c"
+#line 7046 "EditingTools.c"
 				gfloat _tmp19_ = 0.0F;
-#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp19_ = self->priv->custom_aspect_ratio;
-#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_result_ = _tmp19_;
-#line 7043 "EditingTools.c"
+#line 7052 "EditingTools.c"
 			}
 		}
 	}
-#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->reticle_orientation;
-#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp20_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 7051 "EditingTools.c"
+#line 7060 "EditingTools.c"
 		gfloat _tmp21_ = 0.0F;
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = _result_;
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = 1.0f / _tmp21_;
-#line 7057 "EditingTools.c"
+#line 7066 "EditingTools.c"
 	}
-#line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
-#line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7063 "EditingTools.c"
+#line 7072 "EditingTools.c"
 }
 
 
@@ -7070,23 +7079,23 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 	gfloat _tmp1_ = 0.0F;
 	gfloat _tmp2_ = 0.0F;
 	EditingToolsCropToolReticleOrientation _tmp18_ = 0;
-#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
-#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_CROP_TOOL_IS_CONSTRAINT_DESCRIPTION (constraint), 0.0F);
-#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), 0.0F);
-#line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = constraint;
-#line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->aspect_ratio;
-#line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp1_;
-#line 930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _result_;
-#line 930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 7090 "EditingTools.c"
+#line 7099 "EditingTools.c"
 		Dimensions orig_dim = {0};
 		Photo* _tmp3_ = NULL;
 		Dimensions _tmp4_ = {0};
@@ -7094,30 +7103,30 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 		gint _tmp6_ = 0;
 		Dimensions _tmp7_ = {0};
 		gint _tmp8_ = 0;
-#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = photo;
-#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		photo_get_original_dimensions (_tmp3_, &_tmp4_);
-#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		orig_dim = _tmp4_;
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = orig_dim;
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.width;
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = orig_dim;
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.height;
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = ((gfloat) _tmp6_) / ((gfloat) _tmp8_);
-#line 7114 "EditingTools.c"
+#line 7123 "EditingTools.c"
 	} else {
 		gfloat _tmp9_ = 0.0F;
-#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _result_;
-#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp9_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 7121 "EditingTools.c"
+#line 7130 "EditingTools.c"
 			GdkScreen* screen = NULL;
 			GdkScreen* _tmp10_ = NULL;
 			GdkScreen* _tmp11_ = NULL;
@@ -7125,58 +7134,58 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 			gint _tmp13_ = 0;
 			GdkScreen* _tmp14_ = NULL;
 			gint _tmp15_ = 0;
-#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = gdk_screen_get_default ();
-#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			screen = _tmp11_;
-#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp12_ = screen;
-#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = gdk_screen_get_width (_tmp12_);
-#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = screen;
-#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp15_ = gdk_screen_get_height (_tmp14_);
-#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_result_ = ((gfloat) _tmp13_) / ((gfloat) _tmp15_);
-#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 7147 "EditingTools.c"
+#line 7156 "EditingTools.c"
 		} else {
 			gfloat _tmp16_ = 0.0F;
-#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp16_ = _result_;
-#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 7154 "EditingTools.c"
+#line 7163 "EditingTools.c"
 				gfloat _tmp17_ = 0.0F;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp17_ = self->priv->custom_aspect_ratio;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_result_ = _tmp17_;
-#line 7160 "EditingTools.c"
+#line 7169 "EditingTools.c"
 			}
 		}
 	}
-#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->reticle_orientation;
-#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 7168 "EditingTools.c"
+#line 7177 "EditingTools.c"
 		gfloat _tmp19_ = 0.0F;
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = _result_;
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = 1.0f / _tmp19_;
-#line 7174 "EditingTools.c"
+#line 7183 "EditingTools.c"
 	}
-#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
-#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7180 "EditingTools.c"
+#line 7189 "EditingTools.c"
 }
 
 
@@ -7191,33 +7200,33 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 	gboolean _tmp16_ = FALSE;
 	gfloat _tmp17_ = 0.0F;
 	gfloat _tmp18_ = 0.0F;
-#line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	selected_constraint = _tmp0_;
-#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = selected_constraint;
-#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->aspect_ratio;
-#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 7209 "EditingTools.c"
+#line 7218 "EditingTools.c"
 	} else {
 		EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
 		gfloat _tmp4_ = 0.0F;
-#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_normal_constraint_mode (self);
-#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = selected_constraint;
-#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = _tmp3_->aspect_ratio;
-#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp4_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7221 "EditingTools.c"
+#line 7230 "EditingTools.c"
 			ConfigFacade* _tmp5_ = NULL;
 			ConfigFacade* _tmp6_ = NULL;
 			gint _tmp7_ = 0;
@@ -7226,60 +7235,60 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
 			gint _tmp12_ = 0;
-#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp5_ = config_facade_get_instance ();
-#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = _tmp5_;
-#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->custom_init_width = _tmp7_;
-#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp6_);
-#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = config_facade_get_instance ();
-#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = _tmp8_;
-#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->custom_init_height = _tmp10_;
-#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp9_);
-#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp11_ = self->priv->custom_init_width;
-#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp12_ = self->priv->custom_init_height;
-#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->custom_aspect_ratio = ((gfloat) _tmp11_) / ((gfloat) _tmp12_);
-#line 7256 "EditingTools.c"
+#line 7265 "EditingTools.c"
 		}
 	}
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_pivot_button_state (self);
-#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_;
-#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_->is_pivotable;
-#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = !_tmp15_;
-#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp14_);
-#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp16_) {
-#line 966 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 7275 "EditingTools.c"
+#line 7284 "EditingTools.c"
 	}
-#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->pre_aspect_ratio;
-#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp17_ != _tmp18_) {
-#line 7283 "EditingTools.c"
+#line 7292 "EditingTools.c"
 		Box new_crop = {0};
 		Box _tmp19_ = {0};
 		Box _tmp20_ = {0};
@@ -7289,39 +7298,39 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 		Box _tmp24_ = {0};
 		EditingToolsPhotoCanvas* _tmp25_ = NULL;
 		gfloat _tmp26_ = 0.0F;
-#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = self->priv->scaled_crop;
-#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constrain_crop (self, &_tmp19_, &_tmp20_);
-#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		new_crop = _tmp20_;
-#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = new_crop;
-#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_resized (self, &_tmp21_);
-#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = new_crop;
-#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->scaled_crop = _tmp22_;
-#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = new_crop;
-#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_invalidate_area (_tmp23_, &_tmp24_);
-#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_repaint (_tmp25_);
-#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->pre_aspect_ratio = _tmp26_;
-#line 7321 "EditingTools.c"
+#line 7330 "EditingTools.c"
 	}
-#line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (selected_constraint);
-#line 7325 "EditingTools.c"
+#line 7334 "EditingTools.c"
 }
 
 
@@ -7370,153 +7379,153 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	gint _tmp68_ = 0;
 	gint _tmp69_ = 0;
 	EditingToolsCropToolCropToolWindow* _tmp70_ = NULL;
-#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->constraint_mode;
-#line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM) {
-#line 982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7382 "EditingTools.c"
+#line 7391 "EditingTools.c"
 	}
-#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
-#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->normal_width;
-#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_ == -1) {
-#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 7392 "EditingTools.c"
+#line 7401 "EditingTools.c"
 	} else {
 		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
-#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->crop_tool_window;
-#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_->normal_height;
-#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = _tmp5_ == -1;
-#line 7402 "EditingTools.c"
+#line 7411 "EditingTools.c"
 	}
-#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 7406 "EditingTools.c"
+#line 7415 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp6_ = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp7_ = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->crop_tool_window;
-#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = self->priv->crop_tool_window;
-#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = self->priv->crop_tool_window;
-#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_window_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), &_tmp9_, &_tmp10_);
-#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_->normal_width = _tmp9_;
-#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_->normal_height = _tmp10_;
-#line 7424 "EditingTools.c"
+#line 7433 "EditingTools.c"
 	}
-#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
-#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->layout;
-#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->crop_tool_window;
-#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->constraint_combo;
-#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->crop_tool_window;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_->layout;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->crop_tool_window;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_->pivot_reticle_button;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = self->priv->crop_tool_window;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_->layout;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->crop_tool_window;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_->response_layout;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
-#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->crop_tool_window;
-#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = _tmp23_->layout;
-#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->priv->crop_tool_window;
-#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_->constraint_combo;
-#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = self->priv->crop_tool_window;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = _tmp27_->layout;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->crop_tool_window;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_->custom_width_entry;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->priv->crop_tool_window;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_->layout;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->crop_tool_window;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_->custom_mulsign_label;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = self->priv->crop_tool_window;
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = _tmp35_->layout;
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = self->priv->crop_tool_window;
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = _tmp37_->custom_height_entry;
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
-#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->crop_tool_window;
-#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = _tmp39_->layout;
-#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = self->priv->crop_tool_window;
-#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = _tmp41_->pivot_reticle_button;
-#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = self->priv->crop_tool_window;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp44_ = _tmp43_->layout;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = self->priv->crop_tool_window;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = _tmp45_->response_layout;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget));
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp47_ = self->priv->reticle_orientation;
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp47_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
-#line 7520 "EditingTools.c"
+#line 7529 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp48_ = NULL;
 		GtkEntry* _tmp49_ = NULL;
 		gint _tmp50_ = 0;
@@ -7527,35 +7536,35 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gint _tmp55_ = 0;
 		gchar* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp48_ = self->priv->crop_tool_window;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp49_ = _tmp48_->custom_width_entry;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp50_ = self->priv->custom_init_width;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp51_ = g_strdup_printf ("%d", _tmp50_);
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp52_ = _tmp51_;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp49_, _tmp52_);
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp52_);
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp53_ = self->priv->crop_tool_window;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp54_ = _tmp53_->custom_height_entry;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp55_ = self->priv->custom_init_height;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp56_ = g_strdup_printf ("%d", _tmp55_);
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp57_ = _tmp56_;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp54_, _tmp57_);
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp57_);
-#line 7559 "EditingTools.c"
+#line 7568 "EditingTools.c"
 	} else {
 		EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
 		GtkEntry* _tmp59_ = NULL;
@@ -7567,49 +7576,49 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gint _tmp65_ = 0;
 		gchar* _tmp66_ = NULL;
 		gchar* _tmp67_ = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp58_ = self->priv->crop_tool_window;
-#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp59_ = _tmp58_->custom_width_entry;
-#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp60_ = self->priv->custom_init_height;
-#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp61_ = g_strdup_printf ("%d", _tmp60_);
-#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp62_ = _tmp61_;
-#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp59_, _tmp62_);
-#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp62_);
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp63_ = self->priv->crop_tool_window;
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp64_ = _tmp63_->custom_height_entry;
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp65_ = self->priv->custom_init_width;
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp66_ = g_strdup_printf ("%d", _tmp65_);
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp67_ = _tmp66_;
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp64_, _tmp67_);
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp67_);
-#line 7599 "EditingTools.c"
+#line 7608 "EditingTools.c"
 	}
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = self->priv->custom_init_width;
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = self->priv->custom_init_height;
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_aspect_ratio = ((gfloat) _tmp68_) / ((gfloat) _tmp69_);
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = self->priv->crop_tool_window;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget));
-#line 1010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1015 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM;
-#line 7613 "EditingTools.c"
+#line 7622 "EditingTools.c"
 }
 
 
@@ -7657,125 +7666,125 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop
 	EditingToolsCropToolCropToolWindow* _tmp40_ = NULL;
 	gint _tmp41_ = 0;
 	EditingToolsCropToolCropToolWindow* _tmp42_ = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->constraint_mode;
-#line 1014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL) {
-#line 1015 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7669 "EditingTools.c"
+#line 7678 "EditingTools.c"
 	}
-#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->layout;
-#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->crop_tool_window;
-#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->constraint_combo;
-#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->crop_tool_window;
-#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->layout;
-#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->crop_tool_window;
-#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_->custom_width_entry;
-#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->crop_tool_window;
-#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_->layout;
-#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
-#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->custom_mulsign_label;
-#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->crop_tool_window;
-#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->layout;
-#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->crop_tool_window;
-#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_->custom_height_entry;
-#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
-#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->crop_tool_window;
-#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_->layout;
-#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = self->priv->crop_tool_window;
-#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_->pivot_reticle_button;
-#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->crop_tool_window;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_->layout;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->crop_tool_window;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = _tmp23_->response_layout;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->priv->crop_tool_window;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_->layout;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = self->priv->crop_tool_window;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = _tmp27_->constraint_combo;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->crop_tool_window;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_->layout;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->priv->crop_tool_window;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_->pivot_reticle_button;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->crop_tool_window;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_->layout;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = self->priv->crop_tool_window;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = _tmp35_->response_layout;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
-#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = self->priv->crop_tool_window;
-#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = self->priv->crop_tool_window;
-#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = _tmp38_->normal_width;
-#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = self->priv->crop_tool_window;
-#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = _tmp40_->normal_height;
-#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_window_resize (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_window_get_type (), GtkWindow), _tmp39_, _tmp41_);
-#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = self->priv->crop_tool_window;
-#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 7779 "EditingTools.c"
+#line 7788 "EditingTools.c"
 }
 
 
@@ -7810,118 +7819,118 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 	gint _tmp24_ = 0;
 	gfloat _tmp25_ = 0.0F;
 	Box _tmp30_ = {0};
-#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (crop != NULL);
-#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	user_aspect_ratio = _tmp0_;
-#line 1038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = user_aspect_ratio;
-#line 1038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7826 "EditingTools.c"
+#line 7835 "EditingTools.c"
 		Box _tmp2_ = {0};
-#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = *crop;
-#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*result = _tmp2_;
-#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7834 "EditingTools.c"
+#line 7843 "EditingTools.c"
 	}
-#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = box_get_width (crop);
-#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = box_get_height (crop);
-#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old_area = (gfloat) (_tmp3_ * _tmp4_);
-#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = old_area;
-#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = user_aspect_ratio;
-#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = sqrt ((gdouble) (_tmp5_ / _tmp6_));
-#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_adjust_height (crop, (gint) _tmp7_);
-#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = old_area;
-#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = user_aspect_ratio;
-#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = sqrt ((gdouble) (_tmp8_ * _tmp9_));
-#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_adjust_width (crop, (gint) _tmp10_);
-#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_get_photo_dimensions (self, &_tmp11_);
-#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	image_size = _tmp11_;
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = editing_tools_photo_canvas_get_photo (_tmp12_);
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_;
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_get_straighten (_tmp14_, &_tmp15_);
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	angle = _tmp15_;
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp14_);
-#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = *crop;
-#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = image_size;
-#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.width;
-#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = image_size;
-#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_.height;
-#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = angle;
-#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	clamp_inside_rotated_image (&_tmp16_, _tmp18_, _tmp20_, _tmp21_, FALSE, &_tmp22_);
-#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*crop = _tmp22_;
-#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = box_get_width (crop);
-#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = box_get_height (crop);
-#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = user_aspect_ratio;
-#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (((gfloat) _tmp23_) >= (_tmp24_ * _tmp25_)) {
-#line 7898 "EditingTools.c"
+#line 7907 "EditingTools.c"
 		gint _tmp26_ = 0;
 		gfloat _tmp27_ = 0.0F;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = box_get_height (crop);
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = user_aspect_ratio;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_adjust_width (crop, (gint) (_tmp26_ * _tmp27_));
-#line 7907 "EditingTools.c"
+#line 7916 "EditingTools.c"
 	} else {
 		gint _tmp28_ = 0;
 		gfloat _tmp29_ = 0.0F;
-#line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = box_get_width (crop);
-#line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp29_ = user_aspect_ratio;
-#line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_adjust_height (crop, (gint) (_tmp28_ / _tmp29_));
-#line 7917 "EditingTools.c"
+#line 7926 "EditingTools.c"
 	}
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = *crop;
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp30_;
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 7925 "EditingTools.c"
+#line 7934 "EditingTools.c"
 }
 
 
@@ -7936,60 +7945,60 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
 	EditingToolsCropToolConstraintDescription** _tmp5_ = NULL;
 	gint _tmp5__length1 = 0;
 	EditingToolsCropToolConstraintDescription* _tmp9_ = NULL;
-#line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
-#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = configuration_facade_get_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_index = _tmp2_;
-#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _vala_index;
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->constraints;
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5__length1 = self->priv->constraints_length1;
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ < _tmp5__length1) {
-#line 7960 "EditingTools.c"
+#line 7969 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
 		gint _tmp7_ = 0;
 		EditingToolsCropToolConstraintDescription* _tmp8_ = NULL;
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->constraints;
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6__length1 = self->priv->constraints_length1;
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _vala_index;
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp6_[_tmp7_];
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp8_;
-#line 7975 "EditingTools.c"
+#line 7984 "EditingTools.c"
 	} else {
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = NULL;
-#line 7979 "EditingTools.c"
+#line 7988 "EditingTools.c"
 	}
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp3_);
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp9_;
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (index) {
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*index = _vala_index;
-#line 7989 "EditingTools.c"
+#line 7998 "EditingTools.c"
 	}
-#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7993 "EditingTools.c"
+#line 8002 "EditingTools.c"
 }
 
 
@@ -8070,159 +8079,159 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	Box _tmp119_ = {0};
 	EditingToolsPhotoCanvas* _tmp120_ = NULL;
 	gfloat _tmp121_ = 0.0F;
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_bind_canvas_handlers (self, _tmp0_);
-#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = canvas;
-#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_photo_canvas_get_default_ctx (_tmp1_);
-#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = canvas;
-#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_surface_dim (_tmp4_, &_tmp5_);
-#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_prepare_ctx (self, _tmp3_, &_tmp5_);
-#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (_tmp3_);
-#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->crop_surface;
-#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp6_ != NULL) {
-#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 8104 "EditingTools.c"
+#line 8113 "EditingTools.c"
 	}
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = canvas;
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp7_, &_tmp8_);
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.width;
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = canvas;
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp10_, &_tmp11_);
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.height;
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp9_, _tmp12_);
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_surface = _tmp13_;
-#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->crop_surface;
-#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = cairo_create (_tmp14_);
-#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	ctx = _tmp15_;
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1085 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = ctx;
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1085 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (_tmp16_, 0.0, 0.0, 0.0, 1.0);
-#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = ctx;
-#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (_tmp17_);
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = canvas;
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = editing_tools_photo_canvas_get_container (_tmp18_);
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_;
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = editing_tools_crop_tool_crop_tool_window_new (_tmp20_);
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp21_);
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->crop_tool_window);
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_tool_window = _tmp21_;
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp20_);
-#line 1087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->crop_tool_window;
-#line 1087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_->constraint_combo;
-#line 1087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->constraint_list;
-#line 1087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_combo_box_set_model (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = canvas;
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = editing_tools_photo_canvas_get_photo (_tmp25_);
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_;
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = photo_has_crop (_tmp27_);
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = !_tmp28_;
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp27_);
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp29_) {
-#line 8176 "EditingTools.c"
+#line 8185 "EditingTools.c"
 		gint index = 0;
 		EditingToolsCropToolConstraintDescription* desc = NULL;
 		gint _tmp30_ = 0;
 		EditingToolsCropToolConstraintDescription* _tmp31_ = NULL;
 		gboolean _tmp32_ = FALSE;
 		EditingToolsCropToolConstraintDescription* _tmp33_ = NULL;
-#line 1090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = editing_tools_crop_tool_get_last_constraint (self, &_tmp30_);
-#line 1090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		index = _tmp30_;
-#line 1090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		desc = _tmp31_;
-#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp33_ = desc;
-#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp33_ != NULL) {
-#line 8193 "EditingTools.c"
+#line 8202 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp34_ = NULL;
 			gboolean _tmp35_ = FALSE;
-#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = desc;
-#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp35_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp34_);
-#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = !_tmp35_;
-#line 8202 "EditingTools.c"
+#line 8211 "EditingTools.c"
 		} else {
-#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = FALSE;
-#line 8206 "EditingTools.c"
+#line 8215 "EditingTools.c"
 		}
-#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp32_) {
-#line 8210 "EditingTools.c"
+#line 8219 "EditingTools.c"
 			EditingToolsCropToolCropToolWindow* _tmp36_ = NULL;
 			GtkComboBox* _tmp37_ = NULL;
 			gint _tmp38_ = 0;
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp36_ = self->priv->crop_tool_window;
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp37_ = _tmp36_->constraint_combo;
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp38_ = index;
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_combo_box_set_active (_tmp37_, _tmp38_);
-#line 8222 "EditingTools.c"
+#line 8231 "EditingTools.c"
 		}
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8226 "EditingTools.c"
+#line 8235 "EditingTools.c"
 	} else {
 		Photo* photo = NULL;
 		EditingToolsPhotoCanvas* _tmp39_ = NULL;
@@ -8235,41 +8244,41 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		gint _tmp44_ = 0;
 		Dimensions _tmp45_ = {0};
 		gint _tmp46_ = 0;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp39_ = canvas;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp40_ = editing_tools_photo_canvas_get_photo (_tmp39_);
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		photo = _tmp40_;
-#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp41_ = photo;
-#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp42_);
-#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cropped_dim = _tmp42_;
-#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp43_ = cropped_dim;
-#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp44_ = _tmp43_.width;
-#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp45_ = cropped_dim;
-#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = _tmp45_.height;
-#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		ratio = ((gfloat) _tmp44_) / ((gfloat) _tmp46_);
-#line 8261 "EditingTools.c"
+#line 8270 "EditingTools.c"
 		{
 			gint index = 0;
-#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			index = 1;
-#line 8266 "EditingTools.c"
+#line 8275 "EditingTools.c"
 			{
 				gboolean _tmp47_ = FALSE;
-#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp47_ = TRUE;
-#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				while (TRUE) {
-#line 8273 "EditingTools.c"
+#line 8282 "EditingTools.c"
 					gint _tmp49_ = 0;
 					EditingToolsCropToolConstraintDescription** _tmp50_ = NULL;
 					gint _tmp50__length1 = 0;
@@ -8281,106 +8290,106 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 					Photo* _tmp55_ = NULL;
 					gfloat _tmp56_ = 0.0F;
 					gdouble _tmp57_ = 0.0;
-#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (!_tmp47_) {
-#line 8287 "EditingTools.c"
+#line 8296 "EditingTools.c"
 						gint _tmp48_ = 0;
-#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp48_ = index;
-#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						index = _tmp48_ + 1;
-#line 8293 "EditingTools.c"
+#line 8302 "EditingTools.c"
 					}
-#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp47_ = FALSE;
-#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp49_ = index;
-#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp50_ = self->priv->constraints;
-#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp50__length1 = self->priv->constraints_length1;
-#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (!(_tmp49_ < _tmp50__length1)) {
-#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						break;
-#line 8307 "EditingTools.c"
+#line 8316 "EditingTools.c"
 					}
-#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp51_ = ratio;
-#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp52_ = self->priv->constraints;
-#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp52__length1 = self->priv->constraints_length1;
-#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp53_ = index;
-#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp54_ = _tmp52_[_tmp53_];
-#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp55_ = photo;
-#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp56_ = editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (self, _tmp54_, _tmp55_);
-#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp57_ = fabs ((gdouble) (_tmp51_ - _tmp56_));
-#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (_tmp57_ < 0.005) {
-#line 8327 "EditingTools.c"
+#line 8336 "EditingTools.c"
 						EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
 						GtkComboBox* _tmp59_ = NULL;
 						gint _tmp60_ = 0;
-#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp58_ = self->priv->crop_tool_window;
-#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp59_ = _tmp58_->constraint_combo;
-#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp60_ = index;
-#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						gtk_combo_box_set_active (_tmp59_, _tmp60_);
-#line 8339 "EditingTools.c"
+#line 8348 "EditingTools.c"
 					}
 				}
 			}
 		}
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (photo);
-#line 8346 "EditingTools.c"
+#line 8355 "EditingTools.c"
 	}
-#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_pivot_button_state (self);
-#line 1107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_bind_window_handlers (self);
-#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp61_ = canvas;
-#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp62_ = editing_tools_photo_canvas_get_photo (_tmp61_);
-#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp63_ = _tmp62_;
-#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp64_);
-#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = _tmp64_;
-#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp63_);
-#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	uncropped_dim = _tmp65_;
-#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp66_ = canvas;
-#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = editing_tools_photo_canvas_get_photo (_tmp66_);
-#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = _tmp67_;
-#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = photo_get_crop (_tmp68_, &_tmp69_, PHOTO_EXCEPTION_NONE);
-#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	crop = _tmp69_;
-#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = !_tmp70_;
-#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp68_);
-#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp71_) {
-#line 8384 "EditingTools.c"
+#line 8393 "EditingTools.c"
 		gint xofs = 0;
 		Dimensions _tmp72_ = {0};
 		gint _tmp73_ = 0;
@@ -8395,228 +8404,228 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		Dimensions _tmp81_ = {0};
 		gint _tmp82_ = 0;
 		gint _tmp83_ = 0;
-#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp72_ = uncropped_dim;
-#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp73_ = _tmp72_.width;
-#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		xofs = (gint) (_tmp73_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_X_PCT);
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp74_ = uncropped_dim;
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp75_ = _tmp74_.height;
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		yofs = (gint) (_tmp75_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_Y_PCT);
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp76_ = xofs;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp77_ = yofs;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp78_ = uncropped_dim;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp79_ = _tmp78_.width;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp80_ = xofs;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp81_ = uncropped_dim;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp82_ = _tmp81_.height;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp83_ = yofs;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_init (&crop, _tmp76_, _tmp77_, _tmp79_ - _tmp80_, _tmp82_ - _tmp83_);
-#line 8429 "EditingTools.c"
+#line 8438 "EditingTools.c"
 	}
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp84_ = uncropped_dim;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp85_ = canvas;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp85_, &_tmp86_);
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions_for_rectangle (&_tmp86_, &_tmp87_);
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_scaled_similar (&crop, &_tmp84_, &_tmp87_, &_tmp88_);
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->scaled_crop = _tmp88_;
 #line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->scaled_crop = _tmp88_;
+#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp89_ = config_facade_get_instance ();
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp90_ = _tmp89_;
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp91_ = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_width = _tmp91_;
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp90_);
-#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp92_ = config_facade_get_instance ();
-#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp93_ = _tmp92_;
-#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp94_ = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_height = _tmp94_;
-#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp93_);
-#line 1133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp95_ = self->priv->custom_width;
-#line 1133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_init_width = _tmp95_;
-#line 1134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp96_ = self->priv->custom_height;
-#line 1134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_init_height = _tmp96_;
-#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp97_ = self->priv->custom_init_width;
-#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp98_ = self->priv->custom_init_height;
-#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->pre_aspect_ratio = ((gfloat) _tmp97_) / ((gfloat) _tmp98_);
-#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp99_ = canvas;
-#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp99_);
-#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp100_ = self->priv->crop_tool_window;
-#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
-#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp101_ = canvas;
-#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp102_ = editing_tools_photo_canvas_get_photo (_tmp101_);
-#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp103_ = _tmp102_;
-#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp104_ = photo_has_crop (_tmp103_);
-#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp105_ = !_tmp104_;
-#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp103_);
-#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp105_) {
-#line 8501 "EditingTools.c"
+#line 8510 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* desc = NULL;
 		EditingToolsCropToolConstraintDescription* _tmp106_ = NULL;
 		gboolean _tmp107_ = FALSE;
 		gboolean _tmp108_ = FALSE;
 		EditingToolsCropToolConstraintDescription* _tmp109_ = NULL;
-#line 1145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp106_ = editing_tools_crop_tool_get_last_constraint (self, NULL);
-#line 1145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		desc = _tmp106_;
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp109_ = desc;
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp109_ != NULL) {
-#line 8515 "EditingTools.c"
+#line 8524 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp110_ = NULL;
 			gboolean _tmp111_ = FALSE;
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp110_ = desc;
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp111_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp110_);
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp108_ = !_tmp111_;
-#line 8524 "EditingTools.c"
+#line 8533 "EditingTools.c"
 		} else {
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp108_ = FALSE;
-#line 8528 "EditingTools.c"
+#line 8537 "EditingTools.c"
 		}
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp108_) {
-#line 8532 "EditingTools.c"
+#line 8541 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp112_ = NULL;
 			gfloat _tmp113_ = 0.0F;
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp112_ = desc;
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp113_ = _tmp112_->aspect_ratio;
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp107_ = _tmp113_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO;
-#line 8541 "EditingTools.c"
+#line 8550 "EditingTools.c"
 		} else {
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp107_ = FALSE;
-#line 8545 "EditingTools.c"
+#line 8554 "EditingTools.c"
 		}
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp107_) {
-#line 1147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 8551 "EditingTools.c"
+#line 8560 "EditingTools.c"
 		}
-#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8555 "EditingTools.c"
+#line 8564 "EditingTools.c"
 	}
-#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp114_ = self->priv->scaled_crop;
-#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constrain_crop (self, &_tmp114_, &_tmp115_);
-#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_crop = _tmp115_;
-#line 1156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp116_ = new_crop;
-#line 1156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_crop_resized (self, &_tmp116_);
-#line 1157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp117_ = new_crop;
-#line 1157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_crop = _tmp117_;
-#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp118_ = canvas;
-#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp119_ = new_crop;
-#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp118_, &_tmp119_);
-#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp120_ = canvas;
-#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp120_);
-#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp121_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->pre_aspect_ratio = _tmp121_;
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 8587 "EditingTools.c"
+#line 8596 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
-#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_prepare_ctx ((EditingToolsCropTool*) self, ctx, dim);
-#line 8594 "EditingTools.c"
+#line 8603 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_resized_pixbuf ((EditingToolsCropTool*) self, old_dim, scaled, scaled_position);
-#line 8601 "EditingTools.c"
+#line 8610 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-#line 1164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp0_, "new-surface", (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = canvas;
-#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8620 "EditingTools.c"
+#line 8629 "EditingTools.c"
 }
 
 
@@ -8625,83 +8634,83 @@ static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool
 	guint _tmp1_ = 0U;
 	EditingToolsPhotoCanvas* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = canvas;
-#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
-#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8645 "EditingTools.c"
+#line 8654 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_crop_ok ((EditingToolsCropTool*) self);
-#line 8652 "EditingTools.c"
+#line 8661 "EditingTools.c"
 }
 
 
 static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self);
-#line 8659 "EditingTools.c"
+#line 8668 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed ((EditingToolsCropTool*) self);
-#line 8666 "EditingTools.c"
+#line 8675 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_pivot_button_clicked ((EditingToolsCropTool*) self);
-#line 8673 "EditingTools.c"
+#line 8682 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_crop_tool_on_width_entry_focus_out ((EditingToolsCropTool*) self, event);
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8682 "EditingTools.c"
+#line 8691 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_crop_tool_on_height_entry_focus_out ((EditingToolsCropTool*) self, event);
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8691 "EditingTools.c"
+#line 8700 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_width_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8698 "EditingTools.c"
+#line 8707 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_height_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8705 "EditingTools.c"
+#line 8714 "EditingTools.c"
 }
 
 
@@ -8723,61 +8732,61 @@ static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool*
 	GtkEntry* _tmp14_ = NULL;
 	EditingToolsCropToolCropToolWindow* _tmp15_ = NULL;
 	GtkEntry* _tmp16_ = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->ok_button;
-#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp2_, "clicked", (GCallback) _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked, self);
-#line 1177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->crop_tool_window;
-#line 1177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->cancel_button;
-#line 1177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp4_, "clicked", (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->crop_tool_window;
-#line 1178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->constraint_combo;
-#line 1178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp6_, "changed", (GCallback) _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed, self);
-#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->crop_tool_window;
-#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_->pivot_reticle_button;
-#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp8_, "clicked", (GCallback) _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked, self);
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->crop_tool_window;
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_->custom_width_entry;
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->custom_height_entry;
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->crop_tool_window;
-#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->custom_width_entry;
-#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
-#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->crop_tool_window;
-#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_->custom_height_entry;
-#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text, self);
-#line 8781 "EditingTools.c"
+#line 8790 "EditingTools.c"
 }
 
 
@@ -8805,71 +8814,71 @@ static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool
 	EditingToolsCropToolCropToolWindow* _tmp20_ = NULL;
 	GtkEntry* _tmp21_ = NULL;
 	guint _tmp22_ = 0U;
-#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp1_, NULL, FALSE);
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
-#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->ok_button;
-#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp4_, NULL, FALSE);
-#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked, self);
-#line 1191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->crop_tool_window;
-#line 1191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->cancel_button;
-#line 1191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp7_, NULL, FALSE);
-#line 1191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->crop_tool_window;
-#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_->constraint_combo;
-#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp10_, NULL, FALSE);
-#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed, self);
-#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
-#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->pivot_reticle_button;
-#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp13_, NULL, FALSE);
-#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked, self);
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->crop_tool_window;
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_->custom_width_entry;
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp16_, NULL, FALSE);
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->crop_tool_window;
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_->custom_height_entry;
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp19_, NULL, FALSE);
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp19_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->crop_tool_window;
-#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_->custom_width_entry;
-#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("insert-text", GTK_TYPE_EDITABLE, &_tmp22_, NULL, FALSE);
-#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
-#line 8873 "EditingTools.c"
+#line 8882 "EditingTools.c"
 }
 
 
@@ -8883,73 +8892,73 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 	const gchar* _tmp4_ = NULL;
 	GdkEventKey* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = event;
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 8901 "EditingTools.c"
+#line 8910 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
 		const gchar* _tmp7_ = NULL;
-#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
-#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_->keyval;
-#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 8914 "EditingTools.c"
+#line 8923 "EditingTools.c"
 	}
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 8920 "EditingTools.c"
+#line 8929 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
 		const gchar* _tmp10_ = NULL;
-#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->keyval;
-#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 8933 "EditingTools.c"
+#line 8942 "EditingTools.c"
 	}
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 1205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1210 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_on_crop_ok (self);
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 8943 "EditingTools.c"
+#line 8952 "EditingTools.c"
 	}
-#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
-#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp12_;
-#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8953 "EditingTools.c"
+#line 8962 "EditingTools.c"
 }
 
 
@@ -8960,21 +8969,21 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 	gboolean _tmp3_ = FALSE;
 	EditingToolsCropToolReticleOrientation _tmp21_ = 0;
 	EditingToolsCropToolReticleOrientation _tmp22_ = 0;
-#line 1212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->aspect_ratio;
-#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO;
-#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp1_);
-#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_) {
-#line 8978 "EditingTools.c"
+#line 8987 "EditingTools.c"
 		gchar* width_text = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
 		GtkEntry* _tmp5_ = NULL;
@@ -8995,69 +9004,69 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 		gint _tmp18_ = 0;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
-#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->crop_tool_window;
-#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_->custom_width_entry;
-#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = gtk_entry_get_text (_tmp5_);
-#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		width_text = _tmp7_;
-#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = self->priv->crop_tool_window;
-#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->custom_height_entry;
-#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = gtk_entry_get_text (_tmp9_);
-#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = g_strdup (_tmp10_);
-#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		height_text = _tmp11_;
-#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = self->priv->crop_tool_window;
-#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = _tmp12_->custom_width_entry;
-#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = height_text;
-#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp13_, _tmp14_);
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = self->priv->crop_tool_window;
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _tmp15_->custom_height_entry;
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = width_text;
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp16_, _tmp17_);
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = self->priv->custom_width;
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		temp = _tmp18_;
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = self->priv->custom_height;
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_width = _tmp19_;
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = temp;
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_height = _tmp20_;
-#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (height_text);
-#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (width_text);
-#line 9051 "EditingTools.c"
+#line 9060 "EditingTools.c"
 	}
-#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->reticle_orientation;
-#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = editing_tools_crop_tool_reticle_orientation_toggle (_tmp21_);
-#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->reticle_orientation = _tmp22_;
-#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed (self);
-#line 9061 "EditingTools.c"
+#line 9070 "EditingTools.c"
 }
 
 
@@ -9066,48 +9075,48 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	EditingToolsCropToolCropToolWindow* _tmp2_ = NULL;
 	EditingToolsPhotoCanvas* _tmp5_ = NULL;
-#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 9076 "EditingTools.c"
+#line 9085 "EditingTools.c"
 		EditingToolsPhotoCanvas* _tmp1_ = NULL;
-#line 1229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_unbind_canvas_handlers (self, _tmp1_);
-#line 9082 "EditingTools.c"
+#line 9091 "EditingTools.c"
 	}
-#line 1231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
-#line 1231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ != NULL) {
-#line 9088 "EditingTools.c"
+#line 9097 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp3_ = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
-#line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_unbind_window_handlers (self);
-#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->crop_tool_window;
-#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->crop_tool_window;
-#line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->crop_tool_window);
-#line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_tool_window = NULL;
-#line 9105 "EditingTools.c"
+#line 9114 "EditingTools.c"
 	}
-#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ != NULL) {
-#line 9111 "EditingTools.c"
+#line 9120 "EditingTools.c"
 		GdkWindow* drawing_window = NULL;
 		EditingToolsPhotoCanvas* _tmp6_ = NULL;
 		GdkWindow* _tmp7_ = NULL;
@@ -9120,47 +9129,47 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 		GdkCursor* _tmp12_ = NULL;
 		GdkWindow* _tmp13_ = NULL;
 		GdkCursor* _tmp14_ = NULL;
-#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = editing_tools_photo_canvas_get_drawing_window (_tmp6_);
-#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		drawing_window = _tmp7_;
-#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = drawing_window;
-#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = gdk_window_get_display (_tmp8_);
-#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		display = _tmp10_;
-#line 1242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = display;
-#line 1242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = gdk_cursor_new_for_display (_tmp11_, GDK_LEFT_PTR);
-#line 1242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cursor = _tmp12_;
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = drawing_window;
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = cursor;
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gdk_window_set_cursor (_tmp13_, _tmp14_);
-#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (cursor);
-#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (display);
-#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (drawing_window);
-#line 9156 "EditingTools.c"
+#line 9165 "EditingTools.c"
 	}
-#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_surface = NULL;
-#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 9164 "EditingTools.c"
+#line 9173 "EditingTools.c"
 }
 
 
@@ -9169,17 +9178,17 @@ static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_wind
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
 	EditingToolsEditingToolWindow* _tmp1_ = NULL;
-#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 9183 "EditingTools.c"
+#line 9192 "EditingTools.c"
 }
 
 
@@ -9195,51 +9204,51 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE
 	GdkPixbuf* _tmp5_ = NULL;
 	GdkPixbuf* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = photo;
-#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp1_);
-#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_max_dim = _tmp1_;
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = photo;
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *scaling;
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = photo_get_pixbuf_with_options (_tmp3_, &_tmp4_, PHOTO_EXCEPTION_CROP, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp5_;
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 9225 "EditingTools.c"
+#line 9234 "EditingTools.c"
 	}
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp2_;
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = NULL;
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp6_;
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (max_dim) {
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 9239 "EditingTools.c"
+#line 9248 "EditingTools.c"
 	}
-#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 9243 "EditingTools.c"
+#line 9252 "EditingTools.c"
 }
 
 
@@ -9263,81 +9272,81 @@ static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cai
 	cairo_surface_t* _tmp16_ = NULL;
 	cairo_t* _tmp17_ = NULL;
 	cairo_t* _tmp18_ = NULL;
-#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (dim != NULL);
-#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = ctx;
-#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = cairo_get_target (_tmp0_);
-#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = cairo_create (_tmp1_);
-#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_black_ctx);
-#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wide_black_ctx = _tmp2_;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->wide_black_ctx;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp3_, "#000");
-#line 1266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->wide_black_ctx;
-#line 1266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp4_, (gdouble) 1);
-#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = ctx;
-#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = cairo_get_target (_tmp5_);
-#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = cairo_create (_tmp6_);
-#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_white_ctx);
-#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wide_white_ctx = _tmp7_;
-#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->wide_white_ctx;
-#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp8_, "#FFF");
-#line 1270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->wide_white_ctx;
-#line 1270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp9_, (gdouble) 1);
-#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = ctx;
-#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = cairo_get_target (_tmp10_);
-#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = cairo_create (_tmp11_);
-#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->thin_white_ctx = _tmp12_;
-#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->thin_white_ctx;
-#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp13_, "#FFF");
-#line 1274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->thin_white_ctx;
-#line 1274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp14_, 0.5);
-#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = ctx;
-#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = cairo_get_target (_tmp15_);
-#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = cairo_create (_tmp16_);
-#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->text_ctx = _tmp17_;
-#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->text_ctx;
-#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_select_font_face (_tmp18_, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-#line 9341 "EditingTools.c"
+#line 9350 "EditingTools.c"
 }
 
 
@@ -9369,91 +9378,91 @@ static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* sel
 	cairo_t* ctx = NULL;
 	cairo_surface_t* _tmp21_ = NULL;
 	cairo_t* _tmp22_ = NULL;
-#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (scaled));
-#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (scaled_position != NULL);
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = scaled;
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions_for_pixbuf (_tmp0_, &_tmp1_);
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_dim = _tmp1_;
-#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_photo_canvas_get_photo (_tmp2_);
-#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp5_);
-#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	uncropped_dim = _tmp6_;
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = *old_dim;
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = uncropped_dim;
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_scaled_similar (&self->priv->scaled_crop, &_tmp7_, &_tmp8_, &_tmp9_);
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	crop = _tmp9_;
-#line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = uncropped_dim;
-#line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = new_dim;
-#line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_scaled_similar (&crop, &_tmp10_, &_tmp11_, &_tmp12_);
-#line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_crop = _tmp12_;
-#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->crop_surface;
-#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp13_ != NULL) {
-#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 9425 "EditingTools.c"
+#line 9434 "EditingTools.c"
 	}
-#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = scaled;
-#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = gdk_pixbuf_get_width (_tmp14_);
-#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_;
-#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = scaled;
-#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = gdk_pixbuf_get_height (_tmp17_);
-#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_;
-#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp16_, _tmp19_);
-#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_surface = _tmp20_;
-#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->crop_surface;
-#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = cairo_create (_tmp21_);
-#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	ctx = _tmp22_;
-#line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 1.0);
-#line 1295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (ctx);
-#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 9457 "EditingTools.c"
+#line 9466 "EditingTools.c"
 }
 
 
@@ -9480,63 +9489,63 @@ static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool*
 	gint _tmp16_ = 0;
 	gint _tmp17_ = 0;
 	EditingToolsPhotoCanvas* _tmp18_ = NULL;
-#line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaled_pixbuf_pos = _tmp1_;
-#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = scaled_pixbuf_pos;
-#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = scaled_pixbuf_pos;
-#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.y;
-#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_offset (&self->priv->scaled_crop, _tmp3_, _tmp5_, &_tmp6_);
-#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	offset_scaled_crop = _tmp6_;
-#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = x;
-#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = y;
-#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_);
-#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->in_manipulation = _tmp9_;
-#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = x;
-#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = scaled_pixbuf_pos;
-#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.x;
-#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	x = _tmp10_ - _tmp12_;
-#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = x;
-#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_x = _tmp13_;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = y;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = scaled_pixbuf_pos;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.y;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	y = _tmp14_ - _tmp16_;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = y;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_y = _tmp17_;
-#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp18_);
-#line 9540 "EditingTools.c"
+#line 9549 "EditingTools.c"
 }
 
 
@@ -9546,33 +9555,33 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
 	EditingToolsPhotoCanvas* _tmp3_ = NULL;
-#line 1314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->in_manipulation;
-#line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == BOX_LOCATION_OUTSIDE) {
-#line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 9558 "EditingTools.c"
+#line 9567 "EditingTools.c"
 	}
-#line 1320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->in_manipulation = BOX_LOCATION_OUTSIDE;
-#line 1321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_x = -1;
-#line 1322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_y = -1;
-#line 1324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = x;
-#line 1324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = y;
-#line 1324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_cursor (self, _tmp1_, _tmp2_);
-#line 1327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 9576 "EditingTools.c"
+#line 9585 "EditingTools.c"
 }
 
 
@@ -9582,34 +9591,34 @@ static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* bas
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
 	EditingToolsPhotoCanvas* _tmp5_ = NULL;
-#line 1330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->in_manipulation;
-#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 9592 "EditingTools.c"
+#line 9601 "EditingTools.c"
 		gint _tmp1_ = 0;
 		gint _tmp2_ = 0;
-#line 1334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
-#line 1334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = y;
-#line 1334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_on_canvas_manipulation (self, _tmp1_, _tmp2_);
-#line 9601 "EditingTools.c"
+#line 9610 "EditingTools.c"
 	}
-#line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = x;
-#line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = y;
-#line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_cursor (self, _tmp3_, _tmp4_);
-#line 1337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp5_);
-#line 9613 "EditingTools.c"
+#line 9622 "EditingTools.c"
 }
 
 
@@ -9643,97 +9652,97 @@ static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, c
 	EditingToolsPhotoCanvas* _tmp22_ = NULL;
 	cairo_surface_t* _tmp23_ = NULL;
 	Box _tmp24_ = {0};
-#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (default_ctx != NULL);
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_drawing_window (_tmp0_);
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gdk_window_get_width (_tmp2_);
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	w = _tmp4_;
-#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_);
-#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_;
-#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = gdk_window_get_height (_tmp7_);
-#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_;
-#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp7_);
-#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	h = _tmp9_;
-#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = default_ctx;
-#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (_tmp10_, 0.0, 0.0, 0.0, 1.0);
-#line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = default_ctx;
-#line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp11_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h);
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = default_ctx;
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp12_);
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = default_ctx;
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (_tmp13_);
-#line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->crop_surface;
-#line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = cairo_create (_tmp14_);
-#line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	ctx = _tmp15_;
-#line 1351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE);
-#line 1352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.5);
-#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (ctx);
-#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.0);
-#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->scaled_crop;
-#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_.left;
-#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->scaled_crop;
-#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.top;
-#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = box_get_width (&self->priv->scaled_crop);
-#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = box_get_height (&self->priv->scaled_crop);
-#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (ctx, (gdouble) _tmp17_, (gdouble) _tmp19_, (gdouble) _tmp20_, (gdouble) _tmp21_);
-#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (ctx);
-#line 1360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->crop_surface;
-#line 1360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_surface (_tmp22_, _tmp23_, TRUE);
-#line 1363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->scaled_crop;
-#line 1363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_paint_crop_tool (self, &_tmp24_);
-#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 9737 "EditingTools.c"
+#line 9746 "EditingTools.c"
 }
 
 
@@ -9778,113 +9787,113 @@ static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) {
 	CropCommand* _tmp35_ = NULL;
 	CropCommand* _tmp36_ = NULL;
 	Dimensions _tmp37_ = {0};
-#line 1366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
-#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->constraint_combo;
-#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gtk_combo_box_get_active (_tmp3_);
-#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	configuration_facade_set_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
-#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->custom_width;
-#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	configuration_facade_set_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp7_);
-#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_;
-#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->custom_height;
-#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	configuration_facade_set_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
-#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp9_);
-#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp11_, &_tmp12_);
-#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions_for_rectangle (&_tmp12_, &_tmp13_);
-#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = editing_tools_photo_canvas_get_photo (_tmp14_);
-#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_;
-#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp17_);
-#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_scaled_similar (&self->priv->scaled_crop, &_tmp13_, &_tmp17_, &_tmp18_);
-#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_;
-#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp16_);
-#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	crop = _tmp19_;
 #line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	crop = _tmp19_;
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp20_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->scaled_crop;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = _tmp23_.left;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->priv->scaled_crop;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_.top;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = box_get_width (&self->priv->scaled_crop);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = box_get_height (&self->priv->scaled_crop);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = gdk_pixbuf_new_subpixbuf (_tmp22_, _tmp24_, _tmp26_, _tmp27_, _tmp28_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp22_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cropped = _tmp30_;
 #line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	cropped = _tmp30_;
+#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = editing_tools_photo_canvas_get_photo (_tmp31_);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = _tmp32_;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = crop;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = crop_command_new (_tmp33_, &_tmp34_, RESOURCES_CROP_LABEL, RESOURCES_CROP_TOOLTIP);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = _tmp35_;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_dimensions (&crop, &_tmp37_);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_COMMAND, Command), cropped, &_tmp37_, TRUE);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp36_);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp33_);
-#line 1366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (cropped);
-#line 9888 "EditingTools.c"
+#line 9897 "EditingTools.c"
 }
 
 
@@ -9904,140 +9913,140 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 	BoxLocation _tmp9_ = 0;
 	GdkCursorType _tmp10_ = 0;
 	GdkCursorType _tmp11_ = 0;
-#line 1390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaled_pos = _tmp1_;
-#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = scaled_pos;
-#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = scaled_pos;
-#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.y;
-#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_offset (&self->priv->scaled_crop, _tmp3_, _tmp5_, &_tmp6_);
-#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	offset_scaled_crop = _tmp6_;
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cursor_type = GDK_LEFT_PTR;
-#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = x;
-#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = y;
-#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_);
-#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	switch (_tmp9_) {
-#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 9940 "EditingTools.c"
+#line 9949 "EditingTools.c"
 		{
-#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_LEFT_SIDE;
-#line 1399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9946 "EditingTools.c"
+#line 9955 "EditingTools.c"
 		}
-#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 9950 "EditingTools.c"
+#line 9959 "EditingTools.c"
 		{
-#line 1402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_SIDE;
-#line 1403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9956 "EditingTools.c"
+#line 9965 "EditingTools.c"
 		}
-#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 9960 "EditingTools.c"
+#line 9969 "EditingTools.c"
 		{
-#line 1406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_RIGHT_SIDE;
-#line 1407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9966 "EditingTools.c"
+#line 9975 "EditingTools.c"
 		}
-#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 9970 "EditingTools.c"
+#line 9979 "EditingTools.c"
 		{
-#line 1410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_SIDE;
-#line 1411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9976 "EditingTools.c"
+#line 9985 "EditingTools.c"
 		}
-#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 9980 "EditingTools.c"
+#line 9989 "EditingTools.c"
 		{
-#line 1414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_LEFT_CORNER;
-#line 1415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9986 "EditingTools.c"
+#line 9995 "EditingTools.c"
 		}
-#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 9990 "EditingTools.c"
+#line 9999 "EditingTools.c"
 		{
-#line 1418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_LEFT_CORNER;
-#line 1419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9996 "EditingTools.c"
+#line 10005 "EditingTools.c"
 		}
-#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 10000 "EditingTools.c"
+#line 10009 "EditingTools.c"
 		{
-#line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_RIGHT_CORNER;
-#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10006 "EditingTools.c"
+#line 10015 "EditingTools.c"
 		}
-#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 10010 "EditingTools.c"
+#line 10019 "EditingTools.c"
 		{
-#line 1426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_RIGHT_CORNER;
-#line 1427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10016 "EditingTools.c"
+#line 10025 "EditingTools.c"
 		}
-#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 10020 "EditingTools.c"
+#line 10029 "EditingTools.c"
 		{
-#line 1430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_FLEUR;
-#line 1431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10026 "EditingTools.c"
+#line 10035 "EditingTools.c"
 		}
 		default:
 		{
-#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10032 "EditingTools.c"
+#line 10041 "EditingTools.c"
 		}
 	}
-#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = cursor_type;
-#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->current_cursor_type;
-#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != _tmp11_) {
-#line 10041 "EditingTools.c"
+#line 10050 "EditingTools.c"
 		GdkWindow* drawing_window = NULL;
 		EditingToolsPhotoCanvas* _tmp12_ = NULL;
 		GdkWindow* _tmp13_ = NULL;
@@ -10052,45 +10061,45 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 		GdkWindow* _tmp20_ = NULL;
 		GdkCursor* _tmp21_ = NULL;
 		GdkCursorType _tmp22_ = 0;
-#line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = editing_tools_photo_canvas_get_drawing_window (_tmp12_);
-#line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		drawing_window = _tmp13_;
-#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = drawing_window;
-#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = gdk_window_get_display (_tmp14_);
-#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		display = _tmp16_;
-#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = display;
-#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = cursor_type;
-#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = gdk_cursor_new_for_display (_tmp17_, _tmp18_);
-#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cursor = _tmp19_;
-#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = drawing_window;
-#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = cursor;
-#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gdk_window_set_cursor (_tmp20_, _tmp21_);
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = cursor_type;
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->current_cursor_type = _tmp22_;
-#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (cursor);
-#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (display);
-#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (drawing_window);
-#line 10094 "EditingTools.c"
+#line 10103 "EditingTools.c"
 	}
 }
 
@@ -10106,31 +10115,31 @@ static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self
 	gdouble _tmp4_ = 0.0;
 	gdouble _tmp5_ = 0.0;
 	gdouble _tmp6_ = 0.0;
-#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0);
-#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = bounds_y;
-#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = center_y;
-#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = bounds_x;
-#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = center_x;
-#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	decision_slope = (_tmp0_ - _tmp1_) / (_tmp2_ - _tmp3_);
-#line 1450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = bounds_y;
-#line 1450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = bounds_x;
-#line 1450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	decision_intercept = _tmp4_ - (decision_slope * _tmp5_);
-#line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = user_x;
-#line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = (gint) ((decision_slope * _tmp6_) + decision_intercept);
-#line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 10134 "EditingTools.c"
+#line 10143 "EditingTools.c"
 }
 
 
@@ -10167,136 +10176,136 @@ static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool*
 	gint _tmp26_ = 0;
 	gdouble _tmp27_ = 0.0;
 	Dimensions _tmp28_ = {0};
-#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_);
-#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp3_);
-#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_dims = _tmp4_;
-#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_surface_dim (_tmp5_, &_tmp6_);
-#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	surface_dims = _tmp6_;
-#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = surface_dims;
-#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.width;
-#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = photo_dims;
-#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.width;
-#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = surface_dims;
-#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.height;
-#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = photo_dims;
-#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.height;
-#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = MIN (((gdouble) _tmp8_) / _tmp10_, ((gdouble) _tmp12_) / _tmp14_);
-#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scale_factor = _tmp15_;
-#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = scale_factor;
-#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = MIN (_tmp16_, 1.0);
-#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scale_factor = _tmp17_;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_);
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_STRAIGHTEN, &_tmp21_);
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_dims = _tmp21_;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp20_);
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = photo_dims;
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.width;
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = scale_factor;
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = photo_dims;
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_.height;
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = scale_factor;
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_.width = (gint) (_tmp23_ * _tmp24_);
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_.height = (gint) (_tmp26_ * _tmp27_);
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp28_;
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 10251 "EditingTools.c"
+#line 10260 "EditingTools.c"
 }
 
 
 static gboolean _box_equal (const Box* s1, const Box* s2) {
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1 == s2) {
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return TRUE;
-#line 10260 "EditingTools.c"
+#line 10269 "EditingTools.c"
 	}
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1 == NULL) {
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10266 "EditingTools.c"
+#line 10275 "EditingTools.c"
 	}
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s2 == NULL) {
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10272 "EditingTools.c"
+#line 10281 "EditingTools.c"
 	}
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->left != s2->left) {
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10278 "EditingTools.c"
+#line 10287 "EditingTools.c"
 	}
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->top != s2->top) {
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10284 "EditingTools.c"
+#line 10293 "EditingTools.c"
 	}
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->right != s2->right) {
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10290 "EditingTools.c"
+#line 10299 "EditingTools.c"
 	}
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->bottom != s2->bottom) {
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10296 "EditingTools.c"
+#line 10305 "EditingTools.c"
 	}
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return TRUE;
-#line 10300 "EditingTools.c"
+#line 10309 "EditingTools.c"
 }
 
 
@@ -10350,317 +10359,317 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	BoxLocation _tmp254_ = 0;
 	Box _tmp257_ = {0};
 	gfloat _tmp258_ = 0.0F;
-#line 1470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaled_pos = _tmp1_;
-#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = x;
-#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = scaled_pos;
-#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.x;
-#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	x = _tmp2_ - _tmp4_;
-#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = x;
-#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ < 0) {
-#line 1477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = 0;
-#line 10376 "EditingTools.c"
+#line 10385 "EditingTools.c"
 	} else {
 		gint _tmp6_ = 0;
 		GdkRectangle _tmp7_ = {0};
 		gint _tmp8_ = 0;
-#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = x;
-#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = scaled_pos;
-#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.width;
-#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ >= _tmp8_) {
-#line 10389 "EditingTools.c"
+#line 10398 "EditingTools.c"
 			GdkRectangle _tmp9_ = {0};
 			gint _tmp10_ = 0;
-#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = scaled_pos;
-#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = _tmp9_.width;
-#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			x = _tmp10_ - 1;
-#line 10398 "EditingTools.c"
+#line 10407 "EditingTools.c"
 		}
 	}
-#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = y;
-#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = scaled_pos;
-#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.y;
-#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	y = _tmp11_ - _tmp13_;
-#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = y;
-#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp14_ < 0) {
-#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = 0;
-#line 10415 "EditingTools.c"
+#line 10424 "EditingTools.c"
 	} else {
 		gint _tmp15_ = 0;
 		GdkRectangle _tmp16_ = {0};
 		gint _tmp17_ = 0;
-#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = y;
-#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = scaled_pos;
-#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp16_.height;
-#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp15_ >= _tmp17_) {
-#line 10428 "EditingTools.c"
+#line 10437 "EditingTools.c"
 			GdkRectangle _tmp18_ = {0};
 			gint _tmp19_ = 0;
-#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = scaled_pos;
-#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp19_ = _tmp18_.height;
-#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			y = _tmp19_ - 1;
-#line 10437 "EditingTools.c"
+#line 10446 "EditingTools.c"
 		}
 	}
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->scaled_crop;
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_.left;
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	left = _tmp21_;
-#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->scaled_crop;
-#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.top;
-#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	top = _tmp23_;
-#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->scaled_crop;
-#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_.right;
-#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	right = _tmp25_;
-#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = self->priv->scaled_crop;
-#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_.bottom;
-#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bottom = _tmp27_;
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = left;
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = right;
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	center_x = (_tmp28_ + _tmp29_) / 2;
-#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = top;
-#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = bottom;
-#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	center_y = (_tmp30_ + _tmp31_) / 2;
-#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = self->priv->in_manipulation;
-#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	switch (_tmp32_) {
-#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 10482 "EditingTools.c"
+#line 10491 "EditingTools.c"
 		{
 			gint _tmp33_ = 0;
 			gfloat _tmp34_ = 0.0F;
-#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp33_ = x;
-#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			left = _tmp33_;
-#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp34_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10494 "EditingTools.c"
+#line 10503 "EditingTools.c"
 				gfloat new_height = 0.0F;
 				gint _tmp35_ = 0;
 				gint _tmp36_ = 0;
 				gfloat _tmp37_ = 0.0F;
 				gint _tmp38_ = 0;
 				gfloat _tmp39_ = 0.0F;
-#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp35_ = right;
-#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp36_ = left;
-#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp37_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				new_height = ((gfloat) (_tmp35_ - _tmp36_)) / _tmp37_;
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp38_ = top;
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp39_ = new_height;
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp38_ + ((gint) _tmp39_);
-#line 10515 "EditingTools.c"
+#line 10524 "EditingTools.c"
 			}
-#line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10519 "EditingTools.c"
+#line 10528 "EditingTools.c"
 		}
-#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 10523 "EditingTools.c"
+#line 10532 "EditingTools.c"
 		{
 			gint _tmp40_ = 0;
 			gfloat _tmp41_ = 0.0F;
-#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp40_ = y;
-#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			top = _tmp40_;
-#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp41_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp41_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10535 "EditingTools.c"
+#line 10544 "EditingTools.c"
 				gfloat new_width = 0.0F;
 				gint _tmp42_ = 0;
 				gint _tmp43_ = 0;
 				gfloat _tmp44_ = 0.0F;
 				gint _tmp45_ = 0;
 				gfloat _tmp46_ = 0.0F;
-#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp42_ = bottom;
-#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp43_ = top;
-#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp44_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				new_width = ((gfloat) (_tmp42_ - _tmp43_)) * _tmp44_;
-#line 1511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp45_ = left;
-#line 1511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp46_ = new_width;
-#line 1511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp45_ + ((gint) _tmp46_);
-#line 10556 "EditingTools.c"
+#line 10565 "EditingTools.c"
 			}
-#line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10560 "EditingTools.c"
+#line 10569 "EditingTools.c"
 		}
-#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 10564 "EditingTools.c"
+#line 10573 "EditingTools.c"
 		{
 			gint _tmp47_ = 0;
 			gfloat _tmp48_ = 0.0F;
-#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp47_ = x;
-#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			right = _tmp47_;
-#line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp48_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp48_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10576 "EditingTools.c"
+#line 10585 "EditingTools.c"
 				gfloat new_height = 0.0F;
 				gint _tmp49_ = 0;
 				gint _tmp50_ = 0;
 				gfloat _tmp51_ = 0.0F;
 				gint _tmp52_ = 0;
 				gfloat _tmp53_ = 0.0F;
-#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp49_ = right;
-#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp50_ = left;
-#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp51_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				new_height = ((gfloat) (_tmp49_ - _tmp50_)) / _tmp51_;
-#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp52_ = top;
-#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp53_ = new_height;
-#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp52_ + ((gint) _tmp53_);
-#line 10597 "EditingTools.c"
+#line 10606 "EditingTools.c"
 			}
-#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10601 "EditingTools.c"
+#line 10610 "EditingTools.c"
 		}
-#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 10605 "EditingTools.c"
+#line 10614 "EditingTools.c"
 		{
 			gint _tmp54_ = 0;
 			gfloat _tmp55_ = 0.0F;
-#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp54_ = y;
-#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			bottom = _tmp54_;
-#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp55_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp55_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10617 "EditingTools.c"
+#line 10626 "EditingTools.c"
 				gfloat new_width = 0.0F;
 				gint _tmp56_ = 0;
 				gint _tmp57_ = 0;
 				gfloat _tmp58_ = 0.0F;
 				gint _tmp59_ = 0;
 				gfloat _tmp60_ = 0.0F;
-#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp56_ = bottom;
-#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp57_ = top;
-#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp58_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				new_width = ((gfloat) (_tmp56_ - _tmp57_)) * _tmp58_;
-#line 1527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp59_ = left;
-#line 1527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp60_ = new_width;
-#line 1527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp59_ + ((gint) _tmp60_);
-#line 10638 "EditingTools.c"
+#line 10647 "EditingTools.c"
 			}
-#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10642 "EditingTools.c"
+#line 10651 "EditingTools.c"
 		}
-#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 10646 "EditingTools.c"
+#line 10655 "EditingTools.c"
 		{
 			gfloat _tmp61_ = 0.0F;
-#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp61_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp61_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10653 "EditingTools.c"
+#line 10662 "EditingTools.c"
 				gint _tmp62_ = 0;
 				gint _tmp63_ = 0;
-#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp62_ = y;
-#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				top = _tmp62_;
-#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp63_ = x;
-#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = _tmp63_;
-#line 10664 "EditingTools.c"
+#line 10673 "EditingTools.c"
 			} else {
 				gint _tmp64_ = 0;
 				gint _tmp65_ = 0;
@@ -10669,23 +10678,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				gint _tmp68_ = 0;
 				gint _tmp69_ = 0;
 				gint _tmp70_ = 0;
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp64_ = y;
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp65_ = center_x;
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp66_ = center_y;
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp67_ = left;
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp68_ = top;
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp69_ = x;
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp70_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp65_, (gdouble) _tmp66_, (gdouble) _tmp67_, (gdouble) _tmp68_, (gdouble) _tmp69_);
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp64_ < _tmp70_) {
-#line 10689 "EditingTools.c"
+#line 10698 "EditingTools.c"
 					gint _tmp71_ = 0;
 					gfloat new_width = 0.0F;
 					gint _tmp72_ = 0;
@@ -10693,25 +10702,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp74_ = 0.0F;
 					gint _tmp75_ = 0;
 					gfloat _tmp76_ = 0.0F;
-#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp71_ = y;
-#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp71_;
-#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp72_ = bottom;
-#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp73_ = top;
-#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp74_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_width = ((gfloat) (_tmp72_ - _tmp73_)) * _tmp74_;
-#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp75_ = right;
-#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp76_ = new_width;
-#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp75_ - ((gint) _tmp76_);
-#line 10715 "EditingTools.c"
+#line 10724 "EditingTools.c"
 				} else {
 					gint _tmp77_ = 0;
 					gfloat new_height = 0.0F;
@@ -10720,52 +10729,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp80_ = 0.0F;
 					gint _tmp81_ = 0;
 					gfloat _tmp82_ = 0.0F;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp77_ = x;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp77_;
-#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp78_ = right;
-#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp79_ = left;
-#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp80_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_height = ((gfloat) (_tmp78_ - _tmp79_)) / _tmp80_;
-#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp81_ = bottom;
-#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp82_ = new_height;
-#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp81_ - ((gint) _tmp82_);
-#line 10742 "EditingTools.c"
+#line 10751 "EditingTools.c"
 				}
 			}
-#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10747 "EditingTools.c"
+#line 10756 "EditingTools.c"
 		}
-#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 10751 "EditingTools.c"
+#line 10760 "EditingTools.c"
 		{
 			gfloat _tmp83_ = 0.0F;
-#line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp83_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp83_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10758 "EditingTools.c"
+#line 10767 "EditingTools.c"
 				gint _tmp84_ = 0;
 				gint _tmp85_ = 0;
-#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp84_ = y;
-#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp84_;
-#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp85_ = x;
-#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = _tmp85_;
-#line 10769 "EditingTools.c"
+#line 10778 "EditingTools.c"
 			} else {
 				gint _tmp86_ = 0;
 				gint _tmp87_ = 0;
@@ -10774,23 +10783,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				gint _tmp90_ = 0;
 				gint _tmp91_ = 0;
 				gint _tmp92_ = 0;
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp86_ = y;
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp87_ = center_x;
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp88_ = center_y;
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp89_ = left;
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp90_ = bottom;
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp91_ = x;
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp92_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp87_, (gdouble) _tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp91_);
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp86_ < _tmp92_) {
-#line 10794 "EditingTools.c"
+#line 10803 "EditingTools.c"
 					gint _tmp93_ = 0;
 					gfloat new_height = 0.0F;
 					gint _tmp94_ = 0;
@@ -10798,25 +10807,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp96_ = 0.0F;
 					gint _tmp97_ = 0;
 					gfloat _tmp98_ = 0.0F;
-#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp93_ = x;
-#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp93_;
-#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp94_ = right;
-#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp95_ = left;
-#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp96_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_height = ((gfloat) (_tmp94_ - _tmp95_)) / _tmp96_;
-#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp97_ = top;
-#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp98_ = new_height;
-#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp97_ + ((gint) _tmp98_);
-#line 10820 "EditingTools.c"
+#line 10829 "EditingTools.c"
 				} else {
 					gint _tmp99_ = 0;
 					gfloat new_width = 0.0F;
@@ -10825,52 +10834,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp102_ = 0.0F;
 					gint _tmp103_ = 0;
 					gfloat _tmp104_ = 0.0F;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp99_ = y;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp99_;
-#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp100_ = bottom;
-#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp101_ = top;
-#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp102_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_width = ((gfloat) (_tmp100_ - _tmp101_)) * _tmp102_;
-#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp103_ = right;
-#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp104_ = new_width;
-#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp103_ - ((gint) _tmp104_);
-#line 10847 "EditingTools.c"
+#line 10856 "EditingTools.c"
 				}
 			}
-#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10852 "EditingTools.c"
+#line 10861 "EditingTools.c"
 		}
-#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 10856 "EditingTools.c"
+#line 10865 "EditingTools.c"
 		{
 			gfloat _tmp105_ = 0.0F;
-#line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp105_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp105_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10863 "EditingTools.c"
+#line 10872 "EditingTools.c"
 				gint _tmp106_ = 0;
 				gint _tmp107_ = 0;
-#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp106_ = y;
-#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				top = _tmp106_;
-#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp107_ = x;
-#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp107_;
-#line 10874 "EditingTools.c"
+#line 10883 "EditingTools.c"
 			} else {
 				gint _tmp108_ = 0;
 				gint _tmp109_ = 0;
@@ -10879,23 +10888,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				gint _tmp112_ = 0;
 				gint _tmp113_ = 0;
 				gint _tmp114_ = 0;
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp108_ = y;
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp109_ = center_x;
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp110_ = center_y;
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp111_ = right;
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp112_ = top;
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp113_ = x;
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp114_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp109_, (gdouble) _tmp110_, (gdouble) _tmp111_, (gdouble) _tmp112_, (gdouble) _tmp113_);
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp108_ < _tmp114_) {
-#line 10899 "EditingTools.c"
+#line 10908 "EditingTools.c"
 					gint _tmp115_ = 0;
 					gfloat new_width = 0.0F;
 					gint _tmp116_ = 0;
@@ -10903,25 +10912,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp118_ = 0.0F;
 					gint _tmp119_ = 0;
 					gfloat _tmp120_ = 0.0F;
-#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp115_ = y;
-#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp115_;
-#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp116_ = bottom;
-#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp117_ = top;
-#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp118_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_width = ((gfloat) (_tmp116_ - _tmp117_)) * _tmp118_;
-#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp119_ = left;
-#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp120_ = new_width;
-#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp119_ + ((gint) _tmp120_);
-#line 10925 "EditingTools.c"
+#line 10934 "EditingTools.c"
 				} else {
 					gint _tmp121_ = 0;
 					gfloat new_height = 0.0F;
@@ -10930,52 +10939,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp124_ = 0.0F;
 					gint _tmp125_ = 0;
 					gfloat _tmp126_ = 0.0F;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp121_ = x;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp121_;
-#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp122_ = right;
-#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp123_ = left;
-#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp124_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_height = ((gfloat) (_tmp122_ - _tmp123_)) / _tmp124_;
-#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp125_ = bottom;
-#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp126_ = new_height;
-#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp125_ - ((gint) _tmp126_);
-#line 10952 "EditingTools.c"
+#line 10961 "EditingTools.c"
 				}
 			}
-#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10957 "EditingTools.c"
+#line 10966 "EditingTools.c"
 		}
-#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 10961 "EditingTools.c"
+#line 10970 "EditingTools.c"
 		{
 			gfloat _tmp127_ = 0.0F;
-#line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp127_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp127_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10968 "EditingTools.c"
+#line 10977 "EditingTools.c"
 				gint _tmp128_ = 0;
 				gint _tmp129_ = 0;
-#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp128_ = y;
-#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp128_;
-#line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp129_ = x;
-#line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp129_;
-#line 10979 "EditingTools.c"
+#line 10988 "EditingTools.c"
 			} else {
 				gint _tmp130_ = 0;
 				gint _tmp131_ = 0;
@@ -10984,23 +10993,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				gint _tmp134_ = 0;
 				gint _tmp135_ = 0;
 				gint _tmp136_ = 0;
-#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp130_ = y;
-#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp131_ = center_x;
-#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp132_ = center_y;
-#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp133_ = right;
-#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp134_ = bottom;
-#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp135_ = x;
-#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp136_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp131_, (gdouble) _tmp132_, (gdouble) _tmp133_, (gdouble) _tmp134_, (gdouble) _tmp135_);
-#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp130_ < _tmp136_) {
-#line 11004 "EditingTools.c"
+#line 11013 "EditingTools.c"
 					gint _tmp137_ = 0;
 					gfloat new_height = 0.0F;
 					gint _tmp138_ = 0;
@@ -11008,25 +11017,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp140_ = 0.0F;
 					gint _tmp141_ = 0;
 					gfloat _tmp142_ = 0.0F;
-#line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp137_ = x;
-#line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp137_;
-#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp138_ = right;
-#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp139_ = left;
-#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp140_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_height = ((gfloat) (_tmp138_ - _tmp139_)) / _tmp140_;
-#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp141_ = top;
-#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp142_ = new_height;
-#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp141_ + ((gint) _tmp142_);
-#line 11030 "EditingTools.c"
+#line 11039 "EditingTools.c"
 				} else {
 					gint _tmp143_ = 0;
 					gfloat new_width = 0.0F;
@@ -11035,34 +11044,34 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp146_ = 0.0F;
 					gint _tmp147_ = 0;
 					gfloat _tmp148_ = 0.0F;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp143_ = y;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp143_;
-#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp144_ = bottom;
-#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp145_ = top;
-#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp146_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_width = ((gfloat) (_tmp144_ - _tmp145_)) * _tmp146_;
-#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp147_ = left;
-#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp148_ = new_width;
-#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp147_ + ((gint) _tmp148_);
-#line 11057 "EditingTools.c"
+#line 11066 "EditingTools.c"
 				}
 			}
-#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 11062 "EditingTools.c"
+#line 11071 "EditingTools.c"
 		}
-#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 11066 "EditingTools.c"
+#line 11075 "EditingTools.c"
 		{
 			gint _tmp149_ = 0;
 			gint _tmp150_ = 0;
@@ -11106,250 +11115,250 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			gint _tmp186_ = 0;
 			gint _tmp192_ = 0;
 			gint _tmp193_ = 0;
-#line 1600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp149_ = self->priv->last_grab_x;
-#line 1600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_vala_assert (_tmp149_ >= 0, "last_grab_x >= 0");
-#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp150_ = self->priv->last_grab_y;
-#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_vala_assert (_tmp150_ >= 0, "last_grab_y >= 0");
-#line 1603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp151_ = x;
-#line 1603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp152_ = self->priv->last_grab_x;
-#line 1603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			delta_x = _tmp151_ - _tmp152_;
-#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp153_ = y;
-#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp154_ = self->priv->last_grab_y;
-#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			delta_y = _tmp153_ - _tmp154_;
-#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp155_ = x;
-#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->last_grab_x = _tmp155_;
-#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp156_ = y;
-#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->last_grab_y = _tmp156_;
-#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp157_ = right;
-#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp158_ = left;
-#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			width = (_tmp157_ - _tmp158_) + 1;
-#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp159_ = bottom;
-#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp160_ = top;
-#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			height = (_tmp159_ - _tmp160_) + 1;
-#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp161_ = left;
-#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp162_ = delta_x;
-#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			left = _tmp161_ + _tmp162_;
-#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp163_ = top;
-#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp164_ = delta_y;
-#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			top = _tmp163_ + _tmp164_;
-#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp165_ = right;
-#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp166_ = delta_x;
-#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			right = _tmp165_ + _tmp166_;
-#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp167_ = bottom;
-#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp168_ = delta_y;
-#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			bottom = _tmp167_ + _tmp168_;
-#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp169_ = left;
-#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp169_ < 0) {
-#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = 0;
-#line 11180 "EditingTools.c"
+#line 11189 "EditingTools.c"
 			}
-#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp170_ = top;
-#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp170_ < 0) {
-#line 1622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				top = 0;
-#line 11188 "EditingTools.c"
+#line 11197 "EditingTools.c"
 			}
-#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp171_ = right;
-#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp172_ = scaled_pos;
-#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp173_ = _tmp172_.width;
-#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp171_ >= _tmp173_) {
-#line 11198 "EditingTools.c"
+#line 11207 "EditingTools.c"
 				GdkRectangle _tmp174_ = {0};
 				gint _tmp175_ = 0;
-#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp174_ = scaled_pos;
-#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp175_ = _tmp174_.width;
-#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp175_ - 1;
-#line 11207 "EditingTools.c"
+#line 11216 "EditingTools.c"
 			}
-#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp176_ = bottom;
-#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp177_ = scaled_pos;
-#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp178_ = _tmp177_.height;
-#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp176_ >= _tmp178_) {
-#line 11217 "EditingTools.c"
+#line 11226 "EditingTools.c"
 				GdkRectangle _tmp179_ = {0};
 				gint _tmp180_ = 0;
-#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp179_ = scaled_pos;
-#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp180_ = _tmp179_.height;
-#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp180_ - 1;
-#line 11226 "EditingTools.c"
+#line 11235 "EditingTools.c"
 			}
-#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp181_ = right;
-#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp182_ = left;
-#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			adj_width = (_tmp181_ - _tmp182_) + 1;
-#line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp183_ = bottom;
-#line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp184_ = top;
-#line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			adj_height = (_tmp183_ - _tmp184_) + 1;
-#line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp185_ = adj_width;
-#line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp186_ = width;
-#line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp185_ != _tmp186_) {
-#line 11246 "EditingTools.c"
+#line 11255 "EditingTools.c"
 				gint _tmp187_ = 0;
-#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp187_ = delta_x;
-#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp187_ < 0) {
-#line 11252 "EditingTools.c"
+#line 11261 "EditingTools.c"
 					gint _tmp188_ = 0;
 					gint _tmp189_ = 0;
-#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp188_ = left;
-#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp189_ = width;
-#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = (_tmp188_ + _tmp189_) - 1;
-#line 11261 "EditingTools.c"
+#line 11270 "EditingTools.c"
 				} else {
 					gint _tmp190_ = 0;
 					gint _tmp191_ = 0;
-#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp190_ = right;
-#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp191_ = width;
-#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = (_tmp190_ - _tmp191_) + 1;
-#line 11271 "EditingTools.c"
+#line 11280 "EditingTools.c"
 				}
 			}
-#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp192_ = adj_height;
-#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp193_ = height;
-#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp192_ != _tmp193_) {
-#line 11280 "EditingTools.c"
+#line 11289 "EditingTools.c"
 				gint _tmp194_ = 0;
-#line 1642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp194_ = delta_y;
-#line 1642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp194_ < 0) {
-#line 11286 "EditingTools.c"
+#line 11295 "EditingTools.c"
 					gint _tmp195_ = 0;
 					gint _tmp196_ = 0;
-#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp195_ = top;
-#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp196_ = height;
-#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = (_tmp195_ + _tmp196_) - 1;
-#line 11295 "EditingTools.c"
+#line 11304 "EditingTools.c"
 				} else {
 					gint _tmp197_ = 0;
 					gint _tmp198_ = 0;
-#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp197_ = bottom;
-#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp198_ = height;
-#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = (_tmp197_ - _tmp198_) + 1;
-#line 11305 "EditingTools.c"
+#line 11314 "EditingTools.c"
 				}
 			}
-#line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 11310 "EditingTools.c"
+#line 11319 "EditingTools.c"
 		}
 		default:
 		{
-#line 1651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			result = FALSE;
-#line 1651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return result;
-#line 11318 "EditingTools.c"
+#line 11327 "EditingTools.c"
 		}
 	}
-#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp199_ = right;
-#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp200_ = left;
-#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	width = (_tmp199_ - _tmp200_) + 1;
-#line 1662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp201_ = bottom;
-#line 1662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp202_ = top;
-#line 1662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	height = (_tmp201_ - _tmp202_) + 1;
-#line 1664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_get_photo_dimensions (self, &_tmp203_);
-#line 1664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_dims = _tmp203_;
-#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp204_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp205_ = editing_tools_photo_canvas_get_photo (_tmp204_);
-#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp206_ = _tmp205_;
-#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_get_straighten (_tmp206_, &_tmp207_);
-#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	angle = _tmp207_;
-#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp206_);
-#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp208_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp208_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11353 "EditingTools.c"
+#line 11362 "EditingTools.c"
 		gint _tmp209_ = 0;
 		gint _tmp210_ = 0;
 		gint _tmp211_ = 0;
@@ -11368,167 +11377,167 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		gdouble _tmp232_ = 0.0;
 		BoxLocation _tmp233_ = 0;
 		Box _tmp234_ = {0};
-#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp209_ = right;
-#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp210_ = left;
-#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		width = (_tmp209_ - _tmp210_) + 1;
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp211_ = bottom;
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp212_ = top;
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		height = (_tmp211_ - _tmp212_) + 1;
-#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp213_ = self->priv->in_manipulation;
-#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		switch (_tmp213_) {
-#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_LEFT_SIDE:
-#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_LEFT:
-#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_LEFT:
-#line 11394 "EditingTools.c"
+#line 11403 "EditingTools.c"
 			{
 				gint _tmp214_ = 0;
-#line 1677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp214_ = width;
-#line 1677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp214_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11401 "EditingTools.c"
+#line 11410 "EditingTools.c"
 					gint _tmp215_ = 0;
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp215_ = right;
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp215_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11407 "EditingTools.c"
+#line 11416 "EditingTools.c"
 				}
-#line 1679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11411 "EditingTools.c"
+#line 11420 "EditingTools.c"
 			}
-#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_RIGHT_SIDE:
-#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_RIGHT:
-#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11419 "EditingTools.c"
+#line 11428 "EditingTools.c"
 			{
 				gint _tmp216_ = 0;
-#line 1684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp216_ = width;
-#line 1684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp216_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11426 "EditingTools.c"
+#line 11435 "EditingTools.c"
 					gint _tmp217_ = 0;
-#line 1685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp217_ = left;
-#line 1685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp217_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11432 "EditingTools.c"
+#line 11441 "EditingTools.c"
 				}
-#line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11436 "EditingTools.c"
+#line 11445 "EditingTools.c"
 			}
 			default:
 			{
-#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11442 "EditingTools.c"
+#line 11451 "EditingTools.c"
 			}
 		}
-#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp218_ = self->priv->in_manipulation;
-#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		switch (_tmp218_) {
-#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_SIDE:
-#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_LEFT:
-#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_RIGHT:
-#line 11455 "EditingTools.c"
+#line 11464 "EditingTools.c"
 			{
 				gint _tmp219_ = 0;
-#line 1696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp219_ = height;
-#line 1696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp219_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11462 "EditingTools.c"
+#line 11471 "EditingTools.c"
 					gint _tmp220_ = 0;
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp220_ = bottom;
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp220_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11468 "EditingTools.c"
+#line 11477 "EditingTools.c"
 				}
-#line 1698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11472 "EditingTools.c"
+#line 11481 "EditingTools.c"
 			}
-#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_SIDE:
-#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_LEFT:
-#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11480 "EditingTools.c"
+#line 11489 "EditingTools.c"
 			{
 				gint _tmp221_ = 0;
-#line 1703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp221_ = height;
-#line 1703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp221_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11487 "EditingTools.c"
+#line 11496 "EditingTools.c"
 					gint _tmp222_ = 0;
-#line 1704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp222_ = top;
-#line 1704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp222_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11493 "EditingTools.c"
+#line 11502 "EditingTools.c"
 				}
-#line 1705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11497 "EditingTools.c"
+#line 11506 "EditingTools.c"
 			}
 			default:
 			{
-#line 1708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11503 "EditingTools.c"
+#line 11512 "EditingTools.c"
 			}
 		}
-#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp223_ = left;
-#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp224_ = top;
-#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp225_ = right;
-#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp226_ = bottom;
-#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_init (&_tmp227_, _tmp223_, _tmp224_, _tmp225_, _tmp226_);
-#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp228_ = photo_dims;
-#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp229_ = _tmp228_.width;
-#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp230_ = photo_dims;
-#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp231_ = _tmp230_.height;
-#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp232_ = angle;
-#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp233_ = self->priv->in_manipulation;
-#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		clamp_inside_rotated_image (&_tmp227_, _tmp229_, _tmp231_, _tmp232_, _tmp233_ == BOX_LOCATION_INSIDE, &_tmp234_);
-#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		new_crop = _tmp234_;
-#line 11532 "EditingTools.c"
+#line 11541 "EditingTools.c"
 	} else {
 		gint _tmp235_ = 0;
 		gint _tmp236_ = 0;
@@ -11547,128 +11556,128 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		gboolean _tmp248_ = FALSE;
 		Box _tmp249_ = {0};
 		Box _tmp250_ = {0};
-#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp235_ = left;
-#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp236_ = top;
-#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp237_ = right;
-#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp238_ = bottom;
-#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_init (&new_crop, _tmp235_, _tmp236_, _tmp237_, _tmp238_);
-#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp239_ = new_crop;
-#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp240_ = photo_dims;
-#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp241_ = _tmp240_.width;
-#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp242_ = photo_dims;
-#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp243_ = _tmp242_.height;
-#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp244_ = angle;
-#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp245_ = self->priv->in_manipulation;
-#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		clamp_inside_rotated_image (&_tmp239_, _tmp241_, _tmp243_, _tmp244_, _tmp245_ == BOX_LOCATION_INSIDE, &_tmp246_);
-#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		adjusted = _tmp246_;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp249_ = adjusted;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp250_ = new_crop;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_box_equal (&_tmp249_, &_tmp250_) != TRUE) {
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp248_ = TRUE;
-#line 11587 "EditingTools.c"
+#line 11596 "EditingTools.c"
 		} else {
 			gint _tmp251_ = 0;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp251_ = width;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp248_ = _tmp251_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11594 "EditingTools.c"
+#line 11603 "EditingTools.c"
 		}
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp248_) {
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp247_ = TRUE;
-#line 11600 "EditingTools.c"
+#line 11609 "EditingTools.c"
 		} else {
 			gint _tmp252_ = 0;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp252_ = height;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp247_ = _tmp252_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11607 "EditingTools.c"
+#line 11616 "EditingTools.c"
 		}
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp247_) {
-#line 11611 "EditingTools.c"
+#line 11620 "EditingTools.c"
 			Box _tmp253_ = {0};
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp253_ = self->priv->scaled_crop;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			new_crop = _tmp253_;
-#line 11617 "EditingTools.c"
+#line 11626 "EditingTools.c"
 		}
 	}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp254_ = self->priv->in_manipulation;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp254_ != BOX_LOCATION_INSIDE) {
-#line 11624 "EditingTools.c"
+#line 11633 "EditingTools.c"
 		Box _tmp255_ = {0};
-#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp255_ = new_crop;
-#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_resized (self, &_tmp255_);
-#line 11630 "EditingTools.c"
+#line 11639 "EditingTools.c"
 	} else {
 		Box _tmp256_ = {0};
-#line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp256_ = new_crop;
-#line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_moved (self, &_tmp256_);
-#line 11637 "EditingTools.c"
+#line 11646 "EditingTools.c"
 	}
-#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp257_ = new_crop;
-#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_crop = _tmp257_;
-#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp258_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp258_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11647 "EditingTools.c"
+#line 11656 "EditingTools.c"
 		gint _tmp259_ = 0;
 		gint _tmp260_ = 0;
 		gint _tmp261_ = 0;
 		gint _tmp262_ = 0;
-#line 1742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp259_ = box_get_width (&self->priv->scaled_crop);
-#line 1742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_init_width = _tmp259_;
-#line 1743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp260_ = box_get_height (&self->priv->scaled_crop);
-#line 1743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_init_height = _tmp260_;
-#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp261_ = self->priv->custom_init_width;
-#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp262_ = self->priv->custom_init_height;
-#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_aspect_ratio = ((gfloat) _tmp261_) / ((gfloat) _tmp262_);
-#line 11666 "EditingTools.c"
+#line 11675 "EditingTools.c"
 	}
-#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 11672 "EditingTools.c"
+#line 11681 "EditingTools.c"
 }
 
 
@@ -11696,133 +11705,133 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	Box _tmp23_ = {0};
 	EditingToolsPhotoCanvas* _tmp24_ = NULL;
 	Box _tmp25_ = {0};
-#line 1750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (new_crop != NULL);
-#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *new_crop;
-#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_);
-#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 1753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11712 "EditingTools.c"
+#line 11721 "EditingTools.c"
 	}
-#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->scaled_crop;
-#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_);
-#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *new_crop;
-#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = box_resized_complements (&self->priv->scaled_crop, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
-#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	horizontal = _tmp5_;
-#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	horizontal_enlarged = _tmp6_;
-#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	vertical = _tmp7_;
-#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	vertical_enlarged = _tmp8_;
-#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	complements = _tmp9_;
-#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = complements;
-#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp10_ != BOX_COMPLEMENTS_NONE, "complements != BoxComplements.NONE");
-#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = complements;
-#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp12_ == BOX_COMPLEMENTS_HORIZONTAL) {
-#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = TRUE;
-#line 11744 "EditingTools.c"
+#line 11753 "EditingTools.c"
 	} else {
 		BoxComplements _tmp13_ = 0;
-#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = complements;
-#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _tmp13_ == BOX_COMPLEMENTS_BOTH;
-#line 11751 "EditingTools.c"
+#line 11760 "EditingTools.c"
 	}
-#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp11_) {
-#line 11755 "EditingTools.c"
+#line 11764 "EditingTools.c"
 		gdouble _tmp14_ = 0.0;
 		gboolean _tmp15_ = FALSE;
 		Box _tmp16_ = {0};
-#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = horizontal_enlarged;
-#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp15_) {
-#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = 0.0;
-#line 11765 "EditingTools.c"
+#line 11774 "EditingTools.c"
 		} else {
-#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = 0.5;
-#line 11769 "EditingTools.c"
+#line 11778 "EditingTools.c"
 		}
-#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = horizontal;
-#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_area_alpha (self, &_tmp16_, _tmp14_);
-#line 11775 "EditingTools.c"
+#line 11784 "EditingTools.c"
 	}
-#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = complements;
-#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp18_ == BOX_COMPLEMENTS_VERTICAL) {
-#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = TRUE;
-#line 11783 "EditingTools.c"
+#line 11792 "EditingTools.c"
 	} else {
 		BoxComplements _tmp19_ = 0;
-#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = complements;
-#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp19_ == BOX_COMPLEMENTS_BOTH;
-#line 11790 "EditingTools.c"
+#line 11799 "EditingTools.c"
 	}
-#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp17_) {
-#line 11794 "EditingTools.c"
+#line 11803 "EditingTools.c"
 		gdouble _tmp20_ = 0.0;
 		gboolean _tmp21_ = FALSE;
 		Box _tmp22_ = {0};
-#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = vertical_enlarged;
-#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp21_) {
-#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = 0.0;
-#line 11804 "EditingTools.c"
+#line 11813 "EditingTools.c"
 		} else {
-#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = 0.5;
-#line 11808 "EditingTools.c"
+#line 11817 "EditingTools.c"
 		}
-#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = vertical;
-#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_area_alpha (self, &_tmp22_, _tmp20_);
-#line 11814 "EditingTools.c"
+#line 11823 "EditingTools.c"
 	}
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = *new_crop;
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_paint_crop_tool (self, &_tmp23_);
-#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = *new_crop;
-#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp24_, &_tmp25_);
-#line 11826 "EditingTools.c"
+#line 11835 "EditingTools.c"
 }
 
 
@@ -11836,45 +11845,45 @@ static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box*
 	Box _tmp6_ = {0};
 	EditingToolsPhotoCanvas* _tmp7_ = NULL;
 	Box _tmp8_ = {0};
-#line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (new_crop != NULL);
-#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *new_crop;
-#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_);
-#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11852 "EditingTools.c"
+#line 11861 "EditingTools.c"
 	}
-#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->scaled_crop;
-#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_);
-#line 1786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->scaled_crop;
-#line 1786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_set_area_alpha (self, &_tmp4_, 0.5);
-#line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *new_crop;
-#line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_set_area_alpha (self, &_tmp5_, 0.0);
-#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = *new_crop;
-#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_paint_crop_tool (self, &_tmp6_);
-#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *new_crop;
-#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp7_, &_tmp8_);
-#line 11878 "EditingTools.c"
+#line 11887 "EditingTools.c"
 }
 
 
@@ -11892,49 +11901,49 @@ static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self,
 	EditingToolsPhotoCanvas* _tmp9_ = NULL;
 	cairo_surface_t* _tmp10_ = NULL;
 	Box _tmp11_ = {0};
-#line 1795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (area != NULL);
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_surface;
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = cairo_create (_tmp0_);
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	ctx = _tmp1_;
-#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE);
-#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = alpha;
-#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, _tmp2_);
-#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = *area;
-#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.left;
-#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *area;
-#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.top;
-#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = box_get_width (area);
-#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = box_get_height (area);
-#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (ctx, (gdouble) _tmp4_, (gdouble) _tmp6_, (gdouble) _tmp7_, (gdouble) _tmp8_);
-#line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (ctx);
-#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->crop_surface;
-#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = *area;
-#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_surface_area (_tmp9_, _tmp10_, &_tmp11_, TRUE);
-#line 1795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 11938 "EditingTools.c"
+#line 11947 "EditingTools.c"
 }
 
 
@@ -11949,15 +11958,15 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 	EditingToolsPhotoCanvas* _tmp71_ = NULL;
 	cairo_t* _tmp72_ = NULL;
 	Box _tmp73_ = {0};
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (crop != NULL);
-#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->in_manipulation;
-#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 11961 "EditingTools.c"
+#line 11970 "EditingTools.c"
 		gint one_third_x = 0;
 		gint _tmp1_ = 0;
 		gint one_third_y = 0;
@@ -12028,193 +12037,193 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 		const gchar* _tmp62_ = NULL;
 		gint _tmp63_ = 0;
 		gint _tmp64_ = 0;
-#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = box_get_width (crop);
-#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		one_third_x = _tmp1_ / 3;
-#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = box_get_height (crop);
-#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		one_third_y = _tmp2_ / 3;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->thin_white_ctx;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = *crop;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.left;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = *crop;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.top;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = one_third_y;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = box_get_width (crop);
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_horizontal_line (_tmp3_, _tmp4_, _tmp6_, _tmp8_ + _tmp9_, _tmp10_, TRUE);
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = self->priv->thin_white_ctx;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = *crop;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = _tmp13_.left;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = *crop;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _tmp15_.top;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = one_third_y;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = box_get_width (crop);
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_horizontal_line (_tmp11_, _tmp12_, _tmp14_, _tmp16_ + (_tmp17_ * 2), _tmp18_, TRUE);
-#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = self->priv->thin_white_ctx;
-#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = *crop;
-#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = _tmp21_.left;
-#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp23_ = one_third_x;
-#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = *crop;
-#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = _tmp24_.top;
-#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = box_get_height (crop);
-#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_vertical_line (_tmp19_, _tmp20_, _tmp22_ + _tmp23_, _tmp25_, _tmp26_, TRUE);
-#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = self->priv->thin_white_ctx;
-#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp29_ = *crop;
-#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp30_ = _tmp29_.left;
-#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = one_third_x;
-#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp32_ = *crop;
-#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp33_ = _tmp32_.top;
-#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp34_ = box_get_height (crop);
-#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_vertical_line (_tmp27_, _tmp28_, _tmp30_ + (_tmp31_ * 2), _tmp33_, _tmp34_, TRUE);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp35_, &_tmp36_);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dimensions_for_rectangle (&_tmp36_, &_tmp37_);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp39_ = editing_tools_photo_canvas_get_photo (_tmp38_);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp40_ = _tmp39_;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp41_);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_get_scaled_similar (&self->priv->scaled_crop, &_tmp37_, &_tmp41_, &_tmp42_);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp43_ = _tmp42_;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp40_);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		adj_crop = _tmp43_;
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp44_ = box_get_width (&adj_crop);
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp45_ = g_strdup_printf ("%i", _tmp44_);
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = _tmp45_;
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp47_ = g_strconcat (_tmp46_, "x", NULL);
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp48_ = _tmp47_;
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp49_ = box_get_height (&adj_crop);
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp50_ = g_strdup_printf ("%i", _tmp49_);
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp51_ = _tmp50_;
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp52_ = g_strconcat (_tmp48_, _tmp51_, NULL);
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp53_ = _tmp52_;
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp51_);
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp48_);
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp46_);
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		text = _tmp53_;
-#line 1822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp54_ = *crop;
-#line 1822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp55_ = _tmp54_.left;
-#line 1822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp56_ = box_get_width (crop);
-#line 1822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = _tmp55_ + (_tmp56_ / 2);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp57_ = *crop;
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp58_ = _tmp57_.top;
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp59_ = box_get_height (crop);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp58_ + (_tmp59_ / 2);
-#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp60_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp61_ = self->priv->text_ctx;
-#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp62_ = text;
-#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp63_ = x;
-#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp64_ = y;
-#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_text (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, TRUE);
-#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (text);
-#line 12192 "EditingTools.c"
+#line 12201 "EditingTools.c"
 	}
-#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp66_ = self->priv->wide_black_ctx;
-#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = *crop;
-#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_box (_tmp65_, _tmp66_, &_tmp67_);
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = self->priv->wide_white_ctx;
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_reduced (crop, 1, &_tmp70_);
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_box (_tmp68_, _tmp69_, &_tmp70_);
-#line 1830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp72_ = self->priv->wide_white_ctx;
-#line 1830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_reduced (crop, 2, &_tmp73_);
-#line 1830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_box (_tmp71_, _tmp72_, &_tmp73_);
-#line 12218 "EditingTools.c"
+#line 12227 "EditingTools.c"
 }
 
 
@@ -12226,62 +12235,62 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constr
 	gint _tmp3_ = 0;
 	gfloat _tmp4_ = 0.0F;
 	gboolean _tmp8_ = FALSE;
-#line 610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (new_name != NULL, NULL);
-#line 610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsCropToolConstraintDescription*) g_type_create_instance (object_type);
-#line 612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = new_name;
-#line 612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->name = _tmp1_;
-#line 613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = new_basis_width;
-#line 613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->basis_width = _tmp2_;
-#line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = new_basis_height;
-#line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->basis_height = _tmp3_;
-#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = new_aspect_ratio;
-#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS) {
-#line 12254 "EditingTools.c"
+#line 12263 "EditingTools.c"
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->basis_width;
-#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->basis_height;
-#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->aspect_ratio = ((gfloat) _tmp5_) / ((gfloat) _tmp6_);
-#line 12263 "EditingTools.c"
+#line 12272 "EditingTools.c"
 	} else {
 		gfloat _tmp7_ = 0.0F;
-#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = new_aspect_ratio;
-#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->aspect_ratio = _tmp7_;
-#line 12270 "EditingTools.c"
+#line 12279 "EditingTools.c"
 	}
-#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = new_pivotable;
-#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->is_pivotable = _tmp8_;
-#line 610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12278 "EditingTools.c"
+#line 12287 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio) {
-#line 610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_constraint_description_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, new_name, new_basis_width, new_basis_height, new_pivotable, new_aspect_ratio);
-#line 12285 "EditingTools.c"
+#line 12294 "EditingTools.c"
 }
 
 
@@ -12289,237 +12298,237 @@ static gboolean editing_tools_crop_tool_constraint_description_is_separator (Edi
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_CROP_TOOL_IS_CONSTRAINT_DESCRIPTION (self), FALSE);
-#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->is_pivotable;
-#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp1_) {
-#line 12299 "EditingTools.c"
+#line 12308 "EditingTools.c"
 		gfloat _tmp2_ = 0.0F;
-#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->aspect_ratio;
-#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_SEPARATOR;
-#line 12305 "EditingTools.c"
+#line 12314 "EditingTools.c"
 	} else {
-#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 12309 "EditingTools.c"
+#line 12318 "EditingTools.c"
 	}
-#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12315 "EditingTools.c"
+#line 12324 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_constraint_description_init (GValue* value) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 12322 "EditingTools.c"
+#line 12331 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_constraint_description_free_value (GValue* value) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (value->data[0].v_pointer) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (value->data[0].v_pointer);
-#line 12331 "EditingTools.c"
+#line 12340 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_crop_tool_value_constraint_description_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (src_value->data[0].v_pointer) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (src_value->data[0].v_pointer);
-#line 12341 "EditingTools.c"
+#line 12350 "EditingTools.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 12345 "EditingTools.c"
+#line 12354 "EditingTools.c"
 	}
 }
 
 
 static gpointer editing_tools_crop_tool_value_constraint_description_peek_pointer (const GValue* value) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 12353 "EditingTools.c"
+#line 12362 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_crop_tool_value_constraint_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 12360 "EditingTools.c"
+#line 12369 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* object;
 		object = collect_values[0].v_pointer;
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12367 "EditingTools.c"
+#line 12376 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12371 "EditingTools.c"
+#line 12380 "EditingTools.c"
 		}
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (object);
-#line 12375 "EditingTools.c"
+#line 12384 "EditingTools.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12379 "EditingTools.c"
+#line 12388 "EditingTools.c"
 	}
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 12383 "EditingTools.c"
+#line 12392 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_crop_tool_value_constraint_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	EditingToolsCropToolConstraintDescription** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 12394 "EditingTools.c"
+#line 12403 "EditingTools.c"
 	}
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 12400 "EditingTools.c"
+#line 12409 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 12404 "EditingTools.c"
+#line 12413 "EditingTools.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12408 "EditingTools.c"
+#line 12417 "EditingTools.c"
 	}
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 12412 "EditingTools.c"
+#line 12421 "EditingTools.c"
 }
 
 
 static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	EditingToolsCropToolParamSpecConstraintDescription* spec;
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL);
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 12426 "EditingTools.c"
+#line 12435 "EditingTools.c"
 }
 
 
 static gpointer editing_tools_crop_tool_value_get_constraint_description (const GValue* value) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL);
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 12435 "EditingTools.c"
+#line 12444 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_set_constraint_description (GValue* value, gpointer v_object) {
 	EditingToolsCropToolConstraintDescription* old;
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12455 "EditingTools.c"
+#line 12464 "EditingTools.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12459 "EditingTools.c"
+#line 12468 "EditingTools.c"
 	}
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12465 "EditingTools.c"
+#line 12474 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_crop_tool_value_take_constraint_description (GValue* value, gpointer v_object) {
 	EditingToolsCropToolConstraintDescription* old;
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 12484 "EditingTools.c"
+#line 12493 "EditingTools.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12488 "EditingTools.c"
+#line 12497 "EditingTools.c"
 	}
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12494 "EditingTools.c"
+#line 12503 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_crop_tool_constraint_description_class_init (EditingToolsCropToolConstraintDescriptionClass * klass) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_description_parent_class = g_type_class_peek_parent (klass);
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsCropToolConstraintDescriptionClass *) klass)->finalize = editing_tools_crop_tool_constraint_description_finalize;
-#line 12504 "EditingTools.c"
+#line 12513 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_instance_init (EditingToolsCropToolConstraintDescription * self) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 12511 "EditingTools.c"
+#line 12520 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription* obj) {
 	EditingToolsCropToolConstraintDescription * self;
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, EditingToolsCropToolConstraintDescription);
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_destroy (self);
-#line 604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 12523 "EditingTools.c"
+#line 12532 "EditingTools.c"
 }
 
 
@@ -12540,24 +12549,24 @@ static GType editing_tools_crop_tool_constraint_description_get_type (void) {
 static gpointer editing_tools_crop_tool_constraint_description_ref (gpointer instance) {
 	EditingToolsCropToolConstraintDescription* self;
 	self = instance;
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 12548 "EditingTools.c"
+#line 12557 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_unref (gpointer instance) {
 	EditingToolsCropToolConstraintDescription* self;
 	self = instance;
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_GET_CLASS (self)->finalize (self);
-#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 12561 "EditingTools.c"
+#line 12570 "EditingTools.c"
 	}
 }
 
@@ -12565,9 +12574,9 @@ static void editing_tools_crop_tool_constraint_description_unref (gpointer insta
 static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self) {
 	gboolean result;
 	result = editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (model, iter);
-#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12571 "EditingTools.c"
+#line 12580 "EditingTools.c"
 }
 
 
@@ -12610,162 +12619,162 @@ static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_win
 	GtkBox* _tmp32_ = NULL;
 	GtkBox* _tmp33_ = NULL;
 	GtkBox* _tmp34_ = NULL;
-#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = container;
-#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsCropToolCropToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
-#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->cancel_button;
-#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _ ("Return to current photo dimensions");
-#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _tmp2_);
-#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->cancel_button;
-#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image_position (_tmp3_, GTK_POS_LEFT);
-#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->ok_button;
-#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _ ("Set the crop for this photo");
-#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->ok_button;
-#line 665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image_position (_tmp6_, GTK_POS_LEFT);
-#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = (GtkComboBox*) gtk_combo_box_new ();
-#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp7_);
-#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->constraint_combo);
-#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->constraint_combo = _tmp7_;
-#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp8_);
-#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	combo_text_renderer = _tmp8_;
-#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->constraint_combo;
-#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->constraint_combo;
-#line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
-#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->constraint_combo;
-#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_combo_box_set_row_separator_func (_tmp11_, _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
-#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->constraint_combo;
-#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_combo_box_set_active (_tmp12_, 0);
-#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = (GtkImage*) gtk_image_new_from_resource ("/org/gnome/Shotwell/crop-pivot-reticle.png");
-#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp13_);
-#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	image = _tmp13_;
-#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->pivot_reticle_button;
-#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget));
-#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->pivot_reticle_button;
-#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _ ("Pivot the crop rectangle between portrait and landscape orientations");
-#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), _tmp16_);
-#line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->custom_width_entry;
-#line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_entry_set_width_chars (_tmp17_, 4);
-#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->custom_width_entry;
-#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_set (_tmp18_, "editable", TRUE, NULL);
-#line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = self->custom_height_entry;
-#line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_entry_set_width_chars (_tmp19_, 4);
-#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->custom_height_entry;
-#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_set (_tmp20_, "editable", TRUE, NULL);
-#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
-#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp21_);
-#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->response_layout);
-#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->response_layout = _tmp21_;
-#line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->response_layout;
-#line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_set_homogeneous (_tmp22_, TRUE);
-#line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->response_layout;
-#line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->cancel_button;
-#line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
-#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->response_layout;
-#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = self->ok_button;
-#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
-#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp27_);
-#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->layout);
-#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->layout = _tmp27_;
-#line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = self->layout;
-#line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->constraint_combo;
-#line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget));
-#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = self->layout;
-#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->pivot_reticle_button;
-#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
-#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = self->layout;
-#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->response_layout;
-#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
-#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = self->layout;
-#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
-#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (image);
-#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (combo_text_renderer);
-#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12762 "EditingTools.c"
+#line 12771 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container) {
-#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_crop_tool_window_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, container);
-#line 12769 "EditingTools.c"
+#line 12778 "EditingTools.c"
 }
 
 
@@ -12778,44 +12787,44 @@ static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separa
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
-#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (iter != NULL, FALSE);
-#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = model;
-#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = *iter;
-#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_tree_model_get_value (_tmp0_, &_tmp1_, 0, &_tmp2_);
-#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	val = _tmp2_;
-#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = g_value_dup_string (&val);
-#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = g_strcmp0 (_tmp4_, "-") == 0;
-#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (_tmp4_);
-#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp5_;
-#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12810 "EditingTools.c"
+#line 12819 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_crop_tool_window_class_init (EditingToolsCropToolCropToolWindowClass * klass) {
-#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_crop_tool_window_parent_class = g_type_class_peek_parent (klass);
-#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_crop_tool_crop_tool_window_finalize;
-#line 12819 "EditingTools.c"
+#line 12828 "EditingTools.c"
 }
 
 
@@ -12826,83 +12835,83 @@ static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingTools
 	GtkEntry* _tmp3_ = NULL;
 	GtkEntry* _tmp4_ = NULL;
 	GtkLabel* _tmp5_ = NULL;
-#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = (GtkButton*) gtk_button_new_with_label (RESOURCES_CROP_LABEL);
-#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp0_);
-#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ok_button = _tmp0_;
-#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->cancel_button = _tmp1_;
-#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = (GtkButton*) gtk_button_new ();
-#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp2_);
-#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->pivot_reticle_button = _tmp2_;
-#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = (GtkEntry*) gtk_entry_new ();
-#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->custom_width_entry = _tmp3_;
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = (GtkEntry*) gtk_entry_new ();
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp4_);
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->custom_height_entry = _tmp4_;
-#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = (GtkLabel*) gtk_label_new_with_mnemonic ("x");
-#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp5_);
-#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->custom_mulsign_label = _tmp5_;
-#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->most_recently_edited = NULL;
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->response_layout = NULL;
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->layout = NULL;
-#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->normal_width = -1;
-#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->normal_height = -1;
-#line 12876 "EditingTools.c"
+#line 12885 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_crop_tool_window_finalize (GObject* obj) {
 	EditingToolsCropToolCropToolWindow * self;
-#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, EditingToolsCropToolCropToolWindow);
-#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->ok_button);
-#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->cancel_button);
-#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->constraint_combo);
-#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->pivot_reticle_button);
-#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->custom_width_entry);
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->custom_height_entry);
-#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->custom_mulsign_label);
-#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->most_recently_edited);
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->response_layout);
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->layout);
-#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_crop_tool_crop_tool_window_parent_class)->finalize (obj);
-#line 12906 "EditingTools.c"
+#line 12915 "EditingTools.c"
 }
 
 
@@ -12919,31 +12928,31 @@ static GType editing_tools_crop_tool_crop_tool_window_get_type (void) {
 
 
 static void editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klass) {
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_parent_class = g_type_class_peek_parent (klass);
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_crop_tool_finalize;
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsCropToolPrivate));
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->activate = editing_tools_crop_tool_real_activate;
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_crop_tool_real_on_keypress;
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->deactivate = editing_tools_crop_tool_real_deactivate;
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_crop_tool_real_get_tool_window;
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = editing_tools_crop_tool_real_get_display_pixbuf;
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_click = editing_tools_crop_tool_real_on_left_click;
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_released = editing_tools_crop_tool_real_on_left_released;
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_motion = editing_tools_crop_tool_real_on_motion;
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = editing_tools_crop_tool_real_paint;
-#line 12947 "EditingTools.c"
+#line 12956 "EditingTools.c"
 }
 
 
@@ -12955,93 +12964,93 @@ static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self)
 	EditingToolsCropToolConstraintDescription** _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
 	GtkListStore* _tmp5_ = NULL;
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_CROP_TOOL_GET_PRIVATE (self);
-#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_tool_window = NULL;
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_cursor_type = GDK_LEFT_PTR;
-#line 706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->in_manipulation = BOX_LOCATION_OUTSIDE;
-#line 707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wide_black_ctx = NULL;
-#line 708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wide_white_ctx = NULL;
-#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->thin_white_ctx = NULL;
-#line 710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->text_ctx = NULL;
-#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_surface = NULL;
-#line 717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_x = -1;
-#line 718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_y = -1;
-#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_crop_tool_create_constraints (&_tmp0_);
-#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraints = _tmp1_;
-#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraints_length1 = _tmp0_;
-#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_constraints_size_ = self->priv->constraints_length1;
-#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_crop_tool_create_constraints (&_tmp2_);
-#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4__length1 = _tmp2_;
-#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_crop_tool_create_constraint_list (_tmp4_, _tmp2_);
-#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_list = _tmp5_;
-#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = (_vala_array_free (_tmp4_, _tmp4__length1, (GDestroyNotify) editing_tools_crop_tool_constraint_description_unref), NULL);
-#line 722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->entry_insert_in_progress = FALSE;
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_aspect_ratio = 1.0f;
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_width = -1;
-#line 727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_height = -1;
-#line 728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_init_width = -1;
-#line 729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_init_height = -1;
-#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->pre_aspect_ratio = EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO;
-#line 13019 "EditingTools.c"
+#line 13028 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_finalize (EditingToolsEditingTool* obj) {
 	EditingToolsCropTool * self;
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->crop_tool_window);
-#line 707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_black_ctx);
-#line 708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_white_ctx);
-#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraints = (_vala_array_free (self->priv->constraints, self->priv->constraints_length1, (GDestroyNotify) editing_tools_crop_tool_constraint_description_unref), NULL);
-#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->constraint_list);
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->finalize (obj);
-#line 13045 "EditingTools.c"
+#line 13054 "EditingTools.c"
 }
 
 
@@ -13060,17 +13069,17 @@ GType editing_tools_crop_tool_get_type (void) {
 static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self) {
 	GdkPoint default_center = {0};
 	GdkPoint _tmp0_ = {0};
-#line 1843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (self, 0, sizeof (EditingToolsRedeyeInstance));
-#line 1844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (&default_center, 0, sizeof (GdkPoint));
-#line 1845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = default_center;
-#line 1845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*self).center = _tmp0_;
-#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*self).radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS;
-#line 13074 "EditingTools.c"
+#line 13083 "EditingTools.c"
 }
 
 
@@ -13090,51 +13099,51 @@ void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* i
 	gint _tmp11_ = 0;
 	GdkRectangle _tmp12_ = {0};
 	gint _tmp13_ = 0;
-#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (inst != NULL);
-#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (&_result_, 0, sizeof (GdkRectangle));
-#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *inst;
-#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_.center;
-#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_.x;
-#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = *inst;
-#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.radius;
-#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.x = _tmp2_ - _tmp4_;
-#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *inst;
-#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.center;
-#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *inst;
-#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.radius;
-#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.y = _tmp7_ - _tmp9_;
-#line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = *inst;
-#line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.radius;
-#line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.width = 2 * _tmp11_;
-#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _result_;
-#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.width;
-#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.height = _tmp13_;
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13138 "EditingTools.c"
+#line 13147 "EditingTools.c"
 }
 
 
@@ -13154,68 +13163,68 @@ void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, Editing
 	gint _tmp10_ = 0;
 	EditingToolsRedeyeInstance _tmp11_ = {0};
 	gint _tmp12_ = 0;
-#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (rect != NULL);
-#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *rect;
-#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	in_rect = _tmp0_;
-#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_init (&_result_);
-#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = in_rect;
-#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_.width;
-#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = in_rect;
-#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.height;
-#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.radius = (_tmp2_ + _tmp4_) / 4;
-#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = in_rect;
-#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.x;
-#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _result_;
-#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.radius;
-#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.center.x = _tmp6_ + _tmp8_;
-#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = in_rect;
-#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.y;
-#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _result_;
-#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.radius;
-#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.center.y = _tmp10_ + _tmp12_;
-#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
-#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13200 "EditingTools.c"
+#line 13209 "EditingTools.c"
 }
 
 
 EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self) {
 	EditingToolsRedeyeInstance* dup;
-#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dup = g_new0 (EditingToolsRedeyeInstance, 1);
-#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memcpy (dup, self, sizeof (EditingToolsRedeyeInstance));
-#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return dup;
-#line 13212 "EditingTools.c"
+#line 13221 "EditingTools.c"
 }
 
 
 void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self) {
-#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_free (self);
-#line 13219 "EditingTools.c"
+#line 13228 "EditingTools.c"
 }
 
 
@@ -13232,31 +13241,31 @@ GType editing_tools_redeye_instance_get_type (void) {
 
 static EditingToolsRedeyeTool* editing_tools_redeye_tool_construct (GType object_type) {
 	EditingToolsRedeyeTool* self = NULL;
-#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsRedeyeTool*) editing_tools_editing_tool_construct (object_type, "RedeyeTool");
-#line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 13240 "EditingTools.c"
+#line 13249 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeTool* editing_tools_redeye_tool_new (void) {
-#line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_construct (EDITING_TOOLS_TYPE_REDEYE_TOOL);
-#line 13247 "EditingTools.c"
+#line 13256 "EditingTools.c"
 }
 
 
 EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void) {
 	EditingToolsRedeyeTool* result = NULL;
 	EditingToolsRedeyeTool* _tmp0_ = NULL;
-#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_redeye_tool_new ();
-#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13260 "EditingTools.c"
+#line 13269 "EditingTools.c"
 }
 
 
@@ -13269,44 +13278,44 @@ gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling)
 	gboolean _tmp3_ = FALSE;
 	Dimensions _tmp4_ = {0};
 	gint _tmp5_ = 0;
-#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = photo;
-#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp1_);
-#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_);
-#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dim = _tmp2_;
-#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = dim;
-#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.width;
-#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2)) {
-#line 13291 "EditingTools.c"
+#line 13300 "EditingTools.c"
 		Dimensions _tmp6_ = {0};
 		gint _tmp7_ = 0;
-#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = dim;
-#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_.height;
-#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2);
-#line 13300 "EditingTools.c"
+#line 13309 "EditingTools.c"
 	} else {
-#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 13304 "EditingTools.c"
+#line 13313 "EditingTools.c"
 	}
-#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp3_;
-#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13310 "EditingTools.c"
+#line 13319 "EditingTools.c"
 }
 
 
@@ -13329,61 +13338,61 @@ static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRede
 	gint _tmp12_ = 0;
 	GdkPoint _tmp13_ = {0};
 	gint _tmp14_ = 0;
-#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_bounds = _tmp1_;
-#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_.x = 0;
-#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_center = _tmp2_;
-#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = photo_bounds;
-#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.x;
-#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = photo_bounds;
-#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.width;
-#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_center.x = _tmp4_ + (_tmp6_ / 2);
-#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = photo_bounds;
-#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.y;
-#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = photo_bounds;
-#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.height;
-#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_center.y = _tmp8_ + (_tmp10_ / 2);
-#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_init (&_result_);
-#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = photo_center;
-#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.x;
-#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.center.x = _tmp12_;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = photo_center;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.y;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.center.y = _tmp14_;
-#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS;
-#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
-#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13387 "EditingTools.c"
+#line 13396 "EditingTools.c"
 }
 
 
@@ -13398,49 +13407,49 @@ static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self,
 	cairo_t* _tmp7_ = NULL;
 	cairo_t* _tmp8_ = NULL;
 	cairo_t* _tmp9_ = NULL;
-#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (dim != NULL);
-#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = ctx;
-#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = cairo_get_target (_tmp0_);
-#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = cairo_create (_tmp1_);
-#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wider_gray_ctx);
-#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wider_gray_ctx = _tmp2_;
-#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->wider_gray_ctx;
-#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp3_, "#111");
-#line 1950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->wider_gray_ctx;
-#line 1950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp4_, (gdouble) 3);
-#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = ctx;
-#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = cairo_get_target (_tmp5_);
-#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = cairo_create (_tmp6_);
-#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->thin_white_ctx = _tmp7_;
-#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->thin_white_ctx;
-#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp8_, "#FFF");
-#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->thin_white_ctx;
-#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp9_, (gdouble) 1);
-#line 13444 "EditingTools.c"
+#line 13453 "EditingTools.c"
 }
 
 
@@ -13465,55 +13474,55 @@ static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTo
 	gint _tmp17_ = 0;
 	EditingToolsRedeyeInstance _tmp18_ = {0};
 	gint _tmp19_ = 0;
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (inst != NULL);
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->wider_gray_ctx;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *inst;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.center;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.x;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *inst;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.center;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *inst;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.radius;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_circle (_tmp0_, _tmp1_, _tmp4_, _tmp7_, _tmp9_);
-#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->thin_white_ctx;
-#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = *inst;
-#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.center;
-#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.x;
-#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = *inst;
-#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.center;
-#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_.y;
-#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = *inst;
-#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.radius;
-#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_circle (_tmp10_, _tmp11_, _tmp14_, _tmp17_, _tmp19_);
-#line 13517 "EditingTools.c"
+#line 13526 "EditingTools.c"
 }
 
 
@@ -13523,25 +13532,25 @@ static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRed
 	GtkScale* _tmp1_ = NULL;
 	gdouble _tmp2_ = 0.0;
 	EditingToolsPhotoCanvas* _tmp3_ = NULL;
-#line 1964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self), FALSE);
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->redeye_tool_window;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->slider;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.radius = (gint) _tmp2_;
-#line 1968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13545 "EditingTools.c"
+#line 13554 "EditingTools.c"
 }
 
 
@@ -13592,117 +13601,117 @@ static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) {
 	RedeyeCommand* _tmp35_ = NULL;
 	CommandManager* _tmp36_ = NULL;
 	CommandManager* _tmp37_ = NULL;
-#line 1973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->user_interaction_instance;
-#line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_to_bounds_rect (&_tmp0_, &_tmp1_);
-#line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect_user = _tmp1_;
-#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = bounds_rect_user;
-#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_user_to_active_rect (_tmp2_, &_tmp3_, &_tmp4_);
-#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect_active = _tmp4_;
-#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = bounds_rect_active;
-#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_active_to_unscaled_rect (_tmp5_, &_tmp6_, &_tmp7_);
-#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect_unscaled = _tmp7_;
-#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = bounds_rect_unscaled;
-#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_unscaled_to_raw_rect (_tmp8_, &_tmp9_, &_tmp10_);
-#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect_raw = _tmp10_;
-#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = bounds_rect_raw;
-#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_from_bounds_rect (&_tmp11_, &_tmp12_);
-#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	instance_raw = _tmp12_;
 #line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	instance_raw = _tmp12_;
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = editing_tools_photo_canvas_get_photo (_tmp13_);
-#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_;
-#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, &_tmp16_);
-#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_;
-#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp15_);
-#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions = _tmp17_;
-#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	theta = 0.0;
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_);
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_;
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_get_straighten (_tmp20_, &_tmp21_);
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	theta = _tmp21_;
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp20_);
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = instance_raw;
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.center;
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = dimensions;
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_.width;
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = dimensions;
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_.height;
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = theta;
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	derotate_point_arb (&_tmp23_, _tmp25_, _tmp27_, _tmp28_, &_tmp29_);
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	instance_raw.center = _tmp29_;
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = editing_tools_photo_canvas_get_photo (_tmp30_);
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_;
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = instance_raw;
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = redeye_command_new (_tmp32_, &_tmp33_, RESOURCES_RED_EYE_LABEL, RESOURCES_RED_EYE_TOOLTIP);
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = _tmp34_;
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp32_);
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp35_;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = app_window_get_command_manager ();
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = _tmp36_;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp37_);
-#line 1973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 13706 "EditingTools.c"
+#line 13715 "EditingTools.c"
 }
 
 
@@ -13715,29 +13724,29 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 	gboolean _tmp5_ = FALSE;
 	EditingToolsPhotoCanvas* _tmp17_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = map;
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = !_tmp4_;
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_) {
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13741 "EditingTools.c"
+#line 13750 "EditingTools.c"
 	}
 	{
 		GdkPixbuf* _tmp6_ = NULL;
@@ -13749,40 +13758,40 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		GdkPixbuf* _tmp12_ = NULL;
 		GdkPixbuf* _tmp13_ = NULL;
 		GdkPixbuf* _tmp14_ = NULL;
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_);
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_;
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaling (_tmp10_, &_tmp11_);
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp11_, &_inner_error_);
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = _tmp12_;
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp13_;
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13773 "EditingTools.c"
+#line 13782 "EditingTools.c"
 			goto __catch20_g_error;
 		}
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = _tmp6_;
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = NULL;
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->current_pixbuf);
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->current_pixbuf = _tmp14_;
-#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp6_);
-#line 13786 "EditingTools.c"
+#line 13795 "EditingTools.c"
 	}
 	goto __finally20;
 	__catch20_g_error:
@@ -13790,40 +13799,40 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
-#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		err = _inner_error_;
-#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_inner_error_ = NULL;
-#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = err;
-#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _tmp15_->message;
-#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		g_warning ("EditingTools.vala:2011: %s", _tmp16_);
-#line 2012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		g_warning ("EditingTools.vala:2016: %s", _tmp16_);
+#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "aborted");
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_error_free0 (err);
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13810 "EditingTools.c"
+#line 13819 "EditingTools.c"
 	}
 	__finally20:
-#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_critical ("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 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_clear_error (&_inner_error_);
-#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13821 "EditingTools.c"
+#line 13830 "EditingTools.c"
 	}
-#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp17_);
-#line 13827 "EditingTools.c"
+#line 13836 "EditingTools.c"
 }
 
 
@@ -13833,23 +13842,23 @@ static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) {
 	Photo* _tmp2_ = NULL;
 	Photo* _tmp3_ = NULL;
 	Dimensions _tmp4_ = {0};
-#line 2020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->current_pixbuf;
-#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
-#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", NULL, _tmp0_, &_tmp4_, FALSE);
-#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 13853 "EditingTools.c"
+#line 13862 "EditingTools.c"
 }
 
 
@@ -13881,88 +13890,88 @@ static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool*
 	GdkRectangle _tmp22_ = {0};
 	gint _tmp23_ = 0;
 	GdkRectangle _tmp24_ = {0};
-#line 2024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaled_pixbuf_position = _tmp1_;
-#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->user_interaction_instance.center.x;
-#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->old_scaled_pixbuf_position;
-#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.x;
-#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.x = _tmp2_ - _tmp4_;
-#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->user_interaction_instance.center.y;
-#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->old_scaled_pixbuf_position;
-#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.y = _tmp5_ - _tmp7_;
-#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = scaled_pixbuf_position;
-#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.width;
-#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->old_scaled_pixbuf_position;
-#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.width;
-#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scale_factor = ((gdouble) _tmp9_) / ((gdouble) _tmp11_);
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->user_interaction_instance;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.center;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.x;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.x = (gint) ((((gdouble) _tmp14_) * scale_factor) + 0.5);
-#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->user_interaction_instance;
-#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.center;
-#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_.y;
-#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.y = (gint) ((((gdouble) _tmp17_) * scale_factor) + 0.5);
-#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->user_interaction_instance.center.x;
-#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = scaled_pixbuf_position;
-#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_.x;
-#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.x = _tmp18_ + _tmp20_;
-#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->user_interaction_instance.center.y;
-#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = scaled_pixbuf_position;
-#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.y;
-#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.y = _tmp21_ + _tmp23_;
-#line 2044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = scaled_pixbuf_position;
-#line 2044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->old_scaled_pixbuf_position = _tmp24_;
-#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->current_pixbuf);
-#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 13959 "EditingTools.c"
+#line 13968 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_photos_altered ((EditingToolsRedeyeTool*) self, items);
-#line 13966 "EditingTools.c"
+#line 13975 "EditingTools.c"
 }
 
 
@@ -14007,143 +14016,143 @@ static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* ba
 	DataCollection* _tmp34_ = NULL;
 	DataCollection* _tmp35_ = NULL;
 	EditingToolsPhotoCanvas* _tmp37_ = NULL;
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_new_interaction_instance (self, _tmp0_, &_tmp1_);
-#line 2050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance = _tmp1_;
-#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = canvas;
-#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_photo_canvas_get_default_ctx (_tmp2_);
-#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = canvas;
-#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_surface_dim (_tmp5_, &_tmp6_);
-#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_prepare_ctx (self, _tmp4_, &_tmp6_);
-#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (_tmp4_);
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = canvas;
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_bind_canvas_handlers (self, _tmp7_);
-#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = canvas;
-#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_);
-#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->old_scaled_pixbuf_position = _tmp9_;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = canvas;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp10_);
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->current_pixbuf);
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = _tmp11_;
-#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = canvas;
-#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = editing_tools_photo_canvas_get_container (_tmp12_);
-#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_;
-#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = editing_tools_redeye_tool_redeye_tool_window_new (_tmp14_);
-#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp15_);
-#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->redeye_tool_window);
-#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->redeye_tool_window = _tmp15_;
-#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->redeye_tool_window;
-#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_->slider;
-#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->user_interaction_instance;
-#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.radius;
-#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), (gdouble) _tmp19_);
-#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_bind_window_handlers (self);
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = canvas;
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = editing_tools_photo_canvas_get_drawing_window (_tmp20_);
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_;
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = gdk_window_get_display (_tmp22_);
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_;
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp22_);
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	display = _tmp25_;
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = display;
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = gdk_cursor_new_for_display (_tmp26_, GDK_LEFT_PTR);
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->cached_arrow_cursor);
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->cached_arrow_cursor = _tmp27_;
-#line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = display;
-#line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = gdk_cursor_new_for_display (_tmp28_, GDK_FLEUR);
-#line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->cached_grab_cursor);
-#line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->cached_grab_cursor = _tmp29_;
-#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = canvas;
-#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = editing_tools_photo_canvas_get_photo (_tmp30_);
-#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_;
-#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
-#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_;
-#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp32_);
-#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	owner = _tmp34_;
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = owner;
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp35_ != NULL) {
-#line 14131 "EditingTools.c"
+#line 14140 "EditingTools.c"
 		DataCollection* _tmp36_ = NULL;
-#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp36_ = owner;
-#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (_tmp36_, "items-altered", (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14137 "EditingTools.c"
+#line 14146 "EditingTools.c"
 	}
-#line 2072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = canvas;
-#line 2072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp37_);
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_data_collection_unref0 (owner);
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (display);
-#line 14147 "EditingTools.c"
+#line 14156 "EditingTools.c"
 }
 
 
@@ -14151,13 +14160,13 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 	EditingToolsRedeyeTool * self;
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp10_ = NULL;
-#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2076 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2076 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 14161 "EditingTools.c"
+#line 14170 "EditingTools.c"
 		DataCollection* owner = NULL;
 		EditingToolsPhotoCanvas* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
@@ -14166,102 +14175,102 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		DataCollection* _tmp5_ = NULL;
 		DataCollection* _tmp6_ = NULL;
 		EditingToolsPhotoCanvas* _tmp9_ = NULL;
-#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_;
-#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_;
-#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		owner = _tmp5_;
-#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = owner;
-#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 14188 "EditingTools.c"
+#line 14197 "EditingTools.c"
 			DataCollection* _tmp7_ = NULL;
 			guint _tmp8_ = 0U;
-#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = owner;
-#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
-#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14197 "EditingTools.c"
+#line 14206 "EditingTools.c"
 		}
-#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_tool_unbind_canvas_handlers (self, _tmp9_);
-#line 2076 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 14205 "EditingTools.c"
+#line 14214 "EditingTools.c"
 	}
-#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->redeye_tool_window;
-#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 14211 "EditingTools.c"
+#line 14220 "EditingTools.c"
 		EditingToolsRedeyeToolRedeyeToolWindow* _tmp11_ = NULL;
 		EditingToolsRedeyeToolRedeyeToolWindow* _tmp12_ = NULL;
-#line 2085 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_tool_unbind_window_handlers (self);
-#line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = self->priv->redeye_tool_window;
-#line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 2087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = self->priv->redeye_tool_window;
-#line 2087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->redeye_tool_window);
-#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->redeye_tool_window = NULL;
-#line 14228 "EditingTools.c"
+#line 14237 "EditingTools.c"
 	}
-#line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 14232 "EditingTools.c"
+#line 14241 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
-#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_prepare_ctx ((EditingToolsRedeyeTool*) self, ctx, dim);
-#line 14239 "EditingTools.c"
+#line 14248 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_canvas_resize ((EditingToolsRedeyeTool*) self);
-#line 14246 "EditingTools.c"
+#line 14255 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp0_, "new-surface", (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = canvas;
-#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14265 "EditingTools.c"
+#line 14274 "EditingTools.c"
 }
 
 
@@ -14270,46 +14279,46 @@ static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeye
 	guint _tmp1_ = 0U;
 	EditingToolsPhotoCanvas* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = canvas;
-#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
-#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14290 "EditingTools.c"
+#line 14299 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_apply ((EditingToolsRedeyeTool*) self);
-#line 14297 "EditingTools.c"
+#line 14306 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_close ((EditingToolsRedeyeTool*) self);
-#line 14304 "EditingTools.c"
+#line 14313 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value (GtkRange* _sender, GtkScrollType scroll, gdouble new_value, gpointer self) {
 	gboolean result;
 	result = editing_tools_redeye_tool_on_size_slider_adjust ((EditingToolsRedeyeTool*) self, scroll);
-#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14313 "EditingTools.c"
+#line 14322 "EditingTools.c"
 }
 
 
@@ -14320,27 +14329,27 @@ static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTo
 	GtkButton* _tmp3_ = NULL;
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp4_ = NULL;
 	GtkScale* _tmp5_ = NULL;
-#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->redeye_tool_window;
-#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->apply_button;
-#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "clicked", (GCallback) _editing_tools_redeye_tool_on_apply_gtk_button_clicked, self);
-#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->redeye_tool_window;
-#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->close_button;
-#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp3_, "clicked", (GCallback) _editing_tools_redeye_tool_on_close_gtk_button_clicked, self);
-#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->redeye_tool_window;
-#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_->slider;
-#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), "change-value", (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14344 "EditingTools.c"
+#line 14353 "EditingTools.c"
 }
 
 
@@ -14354,33 +14363,33 @@ static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeye
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp6_ = NULL;
 	GtkScale* _tmp7_ = NULL;
 	guint _tmp8_ = 0U;
-#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->redeye_tool_window;
-#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->apply_button;
-#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp2_, NULL, FALSE);
-#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_apply_gtk_button_clicked, self);
-#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->redeye_tool_window;
-#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->close_button;
-#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp5_, NULL, FALSE);
-#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_close_gtk_button_clicked, self);
-#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->redeye_tool_window;
-#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->slider;
-#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("change-value", gtk_range_get_type (), &_tmp8_, NULL, FALSE);
-#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14384 "EditingTools.c"
+#line 14393 "EditingTools.c"
 }
 
 
@@ -14389,17 +14398,17 @@ static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_wi
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_ = NULL;
 	EditingToolsEditingToolWindow* _tmp1_ = NULL;
-#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->redeye_tool_window;
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14403 "EditingTools.c"
+#line 14412 "EditingTools.c"
 }
 
 
@@ -14415,64 +14424,64 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 	GdkPoint _tmp10_ = {0};
 	GdkPoint _tmp11_ = {0};
 	EditingToolsRedeyeInstance _tmp12_ = {0};
-#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->current_pixbuf;
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ != NULL) {
-#line 14427 "EditingTools.c"
+#line 14436 "EditingTools.c"
 		GdkPixbuf* _tmp2_ = NULL;
 		GdkPixbuf* _tmp3_ = NULL;
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->current_pixbuf;
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp3_;
-#line 14438 "EditingTools.c"
+#line 14447 "EditingTools.c"
 	} else {
 		EditingToolsPhotoCanvas* _tmp4_ = NULL;
 		GdkPixbuf* _tmp5_ = NULL;
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp4_);
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp5_;
-#line 14450 "EditingTools.c"
+#line 14459 "EditingTools.c"
 	}
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_pixbuf (_tmp6_, _tmp0_);
-#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->user_interaction_instance;
-#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_inst = _tmp7_;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->user_interaction_instance;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.center;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_user_to_active_point (_tmp8_, &_tmp10_, &_tmp11_);
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_inst.center = _tmp11_;
-#line 2128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = active_inst;
-#line 2128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_draw_redeye_instance (self, &_tmp12_);
-#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp0_);
-#line 14476 "EditingTools.c"
+#line 14485 "EditingTools.c"
 }
 
 
@@ -14485,70 +14494,70 @@ static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingToo
 	gint _tmp3_ = 0;
 	GdkRectangle _tmp4_ = {0};
 	gboolean _tmp5_ = FALSE;
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->user_interaction_instance;
-#line 2132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_to_bounds_rect (&_tmp0_, &_tmp1_);
-#line 2132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect = _tmp1_;
-#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = x;
-#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = y;
-#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = bounds_rect;
-#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = coord_in_rectangle (_tmp2_, _tmp3_, &_tmp4_);
-#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_) {
-#line 14507 "EditingTools.c"
+#line 14516 "EditingTools.c"
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
 		EditingToolsRedeyeInstance _tmp8_ = {0};
 		GdkPoint _tmp9_ = {0};
-#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->is_reticle_move_in_progress = TRUE;
-#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = x;
-#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_move_mouse_start_point.x = _tmp6_;
-#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = y;
-#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_move_mouse_start_point.y = _tmp7_;
-#line 2139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = self->priv->user_interaction_instance;
-#line 2139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_.center;
-#line 2139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_move_anchor = _tmp9_;
-#line 14528 "EditingTools.c"
+#line 14537 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) {
 	EditingToolsRedeyeTool * self;
-#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->is_reticle_move_in_progress = FALSE;
-#line 14539 "EditingTools.c"
+#line 14548 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) {
 	EditingToolsRedeyeTool * self;
 	gboolean _tmp0_ = FALSE;
-#line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->is_reticle_move_in_progress;
-#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 14552 "EditingTools.c"
+#line 14561 "EditingTools.c"
 		GdkRectangle active_region_rect = {0};
 		EditingToolsPhotoCanvas* _tmp1_ = NULL;
 		GdkRectangle _tmp2_ = {0};
@@ -14603,125 +14612,125 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 		gint _tmp45_ = 0;
 		gint _tmp46_ = 0;
 		EditingToolsPhotoCanvas* _tmp47_ = NULL;
-#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp1_, &_tmp2_);
-#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		active_region_rect = _tmp2_;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = active_region_rect;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = _tmp3_.x;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->user_interaction_instance;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.radius;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x_clamp_low = (_tmp4_ + _tmp6_) + 1;
-#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = active_region_rect;
-#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.y;
-#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = self->priv->user_interaction_instance;
-#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = _tmp9_.radius;
-#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y_clamp_low = (_tmp8_ + _tmp10_) + 1;
-#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = active_region_rect;
-#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = _tmp11_.x;
-#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = active_region_rect;
-#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = _tmp13_.width;
-#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = self->priv->user_interaction_instance;
-#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _tmp15_.radius;
-#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x_clamp_high = ((_tmp12_ + _tmp14_) - _tmp16_) - 1;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = active_region_rect;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = _tmp17_.y;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = active_region_rect;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = _tmp19_.height;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = self->priv->user_interaction_instance;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = _tmp21_.radius;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y_clamp_high = ((_tmp18_ + _tmp20_) - _tmp22_) - 1;
-#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp23_ = x;
-#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = self->priv->reticle_move_mouse_start_point;
-#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = _tmp24_.x;
-#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		delta_x = _tmp23_ - _tmp25_;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = y;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = self->priv->reticle_move_mouse_start_point;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = _tmp27_.y;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		delta_y = _tmp26_ - _tmp28_;
-#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp29_ = self->priv->reticle_move_anchor;
-#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp30_ = _tmp29_.x;
-#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = delta_x;
-#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->user_interaction_instance.center.x = _tmp30_ + _tmp31_;
-#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp32_ = self->priv->reticle_move_anchor;
-#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp33_ = _tmp32_.y;
-#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp34_ = delta_y;
-#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->user_interaction_instance.center.y = _tmp33_ + _tmp34_;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp35_ = self->priv->reticle_move_anchor;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp36_ = _tmp35_.x;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp37_ = delta_x;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp38_ = x_clamp_low;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp39_ = x_clamp_high;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp40_ = CLAMP (_tmp36_ + _tmp37_, _tmp38_, _tmp39_);
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->user_interaction_instance.center.x = _tmp40_;
-#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp41_ = self->priv->reticle_move_anchor;
-#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp42_ = _tmp41_.y;
-#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp43_ = delta_y;
-#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp44_ = y_clamp_low;
-#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp45_ = y_clamp_high;
-#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = CLAMP (_tmp42_ + _tmp43_, _tmp44_, _tmp45_);
-#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->user_interaction_instance.center.y = _tmp46_;
-#line 2179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_repaint (_tmp47_);
-#line 14725 "EditingTools.c"
+#line 14734 "EditingTools.c"
 	} else {
 		GdkRectangle bounds = {0};
 		EditingToolsRedeyeInstance _tmp48_ = {0};
@@ -14730,58 +14739,58 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 		gint _tmp51_ = 0;
 		GdkRectangle _tmp52_ = {0};
 		gboolean _tmp53_ = FALSE;
-#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp48_ = self->priv->user_interaction_instance;
-#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_instance_to_bounds_rect (&_tmp48_, &_tmp49_);
-#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		bounds = _tmp49_;
-#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp50_ = x;
-#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp51_ = y;
-#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp52_ = bounds;
-#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp53_ = coord_in_rectangle (_tmp50_, _tmp51_, &_tmp52_);
-#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp53_) {
-#line 14750 "EditingTools.c"
+#line 14759 "EditingTools.c"
 			EditingToolsPhotoCanvas* _tmp54_ = NULL;
 			GdkWindow* _tmp55_ = NULL;
 			GdkWindow* _tmp56_ = NULL;
 			GdkCursor* _tmp57_ = NULL;
-#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp54_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp55_ = editing_tools_photo_canvas_get_drawing_window (_tmp54_);
-#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp56_ = _tmp55_;
-#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp57_ = self->priv->cached_grab_cursor;
-#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gdk_window_set_cursor (_tmp56_, _tmp57_);
-#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp56_);
-#line 14767 "EditingTools.c"
+#line 14776 "EditingTools.c"
 		} else {
 			EditingToolsPhotoCanvas* _tmp58_ = NULL;
 			GdkWindow* _tmp59_ = NULL;
 			GdkWindow* _tmp60_ = NULL;
 			GdkCursor* _tmp61_ = NULL;
-#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp59_ = editing_tools_photo_canvas_get_drawing_window (_tmp58_);
-#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp60_ = _tmp59_;
-#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp61_ = self->priv->cached_arrow_cursor;
-#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gdk_window_set_cursor (_tmp60_, _tmp61_);
-#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp60_);
-#line 14785 "EditingTools.c"
+#line 14794 "EditingTools.c"
 		}
 	}
 }
@@ -14797,73 +14806,73 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 	const gchar* _tmp4_ = NULL;
 	GdkEventKey* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = event;
-#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 14815 "EditingTools.c"
+#line 14824 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
 		const gchar* _tmp7_ = NULL;
-#line 2194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
-#line 2194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_->keyval;
-#line 2194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 2194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 14828 "EditingTools.c"
+#line 14837 "EditingTools.c"
 	}
-#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 14834 "EditingTools.c"
+#line 14843 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
 		const gchar* _tmp10_ = NULL;
-#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->keyval;
-#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 14847 "EditingTools.c"
+#line 14856 "EditingTools.c"
 	}
-#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 2196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_tool_on_close (self);
-#line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 14857 "EditingTools.c"
+#line 14866 "EditingTools.c"
 	}
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp12_;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14867 "EditingTools.c"
+#line 14876 "EditingTools.c"
 }
 
 
@@ -14884,87 +14893,87 @@ static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_
 	GtkScale* _tmp11_ = NULL;
 	GtkButton* _tmp12_ = NULL;
 	GtkButton* _tmp13_ = NULL;
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = container;
-#line 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsRedeyeToolRedeyeToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
-#line 1887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->slider;
-#line 1887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), 80, -1);
-#line 1888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->slider;
-#line 1888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp2_, FALSE);
-#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->close_button;
-#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Close the red-eye tool");
-#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _tmp4_);
-#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->close_button;
-#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image_position (_tmp5_, GTK_POS_LEFT);
-#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->apply_button;
-#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _ ("Remove any red-eye effects in the selected region");
-#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), _tmp7_);
-#line 1894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->apply_button;
-#line 1894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image_position (_tmp8_, GTK_POS_LEFT);
-#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING);
-#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp9_);
-#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	layout = _tmp9_;
-#line 1897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->slider_label;
-#line 1897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->slider;
-#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->close_button;
-#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 1900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->apply_button;
-#line 1900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
-#line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget));
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (layout);
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 14950 "EditingTools.c"
+#line 14959 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container) {
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_redeye_tool_window_construct (EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, container);
-#line 14957 "EditingTools.c"
+#line 14966 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_redeye_tool_window_class_init (EditingToolsRedeyeToolRedeyeToolWindowClass * klass) {
-#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_redeye_tool_window_parent_class = g_type_class_peek_parent (klass);
-#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolRedeyeToolWindowPrivate));
-#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_redeye_tool_redeye_tool_window_finalize;
-#line 14968 "EditingTools.c"
+#line 14977 "EditingTools.c"
 }
 
 
@@ -14974,53 +14983,53 @@ static void editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingT
 	GtkButton* _tmp2_ = NULL;
 	GtkButton* _tmp3_ = NULL;
 	GtkScale* _tmp4_ = NULL;
-#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_GET_PRIVATE (self);
-#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = _ ("Size:");
-#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp0_);
-#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->slider_label = _tmp1_;
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_APPLY_LABEL);
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->apply_button = _tmp2_;
-#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->close_button = _tmp3_;
-#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MIN_RADIUS, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS, 1.0);
-#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp4_);
-#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->slider = _tmp4_;
-#line 15006 "EditingTools.c"
+#line 15015 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject* obj) {
 	EditingToolsRedeyeToolRedeyeToolWindow * self;
-#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, EditingToolsRedeyeToolRedeyeToolWindow);
-#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->slider_label);
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->apply_button);
-#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->close_button);
-#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->slider);
-#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_redeye_tool_redeye_tool_window_parent_class)->finalize (obj);
-#line 15024 "EditingTools.c"
+#line 15033 "EditingTools.c"
 }
 
 
@@ -15037,68 +15046,68 @@ static GType editing_tools_redeye_tool_redeye_tool_window_get_type (void) {
 
 
 static void editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass * klass) {
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_parent_class = g_type_class_peek_parent (klass);
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_redeye_tool_finalize;
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolPrivate));
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->activate = editing_tools_redeye_tool_real_activate;
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->deactivate = editing_tools_redeye_tool_real_deactivate;
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_redeye_tool_real_get_tool_window;
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = editing_tools_redeye_tool_real_paint;
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_click = editing_tools_redeye_tool_real_on_left_click;
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_released = editing_tools_redeye_tool_real_on_left_released;
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_motion = editing_tools_redeye_tool_real_on_motion;
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_redeye_tool_real_on_keypress;
-#line 15063 "EditingTools.c"
+#line 15072 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * self) {
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_REDEYE_TOOL_GET_PRIVATE (self);
-#line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->thin_white_ctx = NULL;
-#line 1907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wider_gray_ctx = NULL;
-#line 1908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->redeye_tool_window = NULL;
-#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->is_reticle_move_in_progress = FALSE;
-#line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 15080 "EditingTools.c"
+#line 15089 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool* obj) {
 	EditingToolsRedeyeTool * self;
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 1907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wider_gray_ctx);
-#line 1908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (self->priv->redeye_tool_window);
 #line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (self->priv->redeye_tool_window);
+#line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->cached_arrow_cursor);
-#line 1914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->cached_grab_cursor);
-#line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->current_pixbuf);
-#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->finalize (obj);
-#line 15102 "EditingTools.c"
+#line 15111 "EditingTools.c"
 }
 
 
@@ -15116,52 +15125,52 @@ GType editing_tools_redeye_tool_get_type (void) {
 
 static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object_type) {
 	EditingToolsAdjustTool* self = NULL;
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustTool*) editing_tools_editing_tool_construct (object_type, "AdjustTool");
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 15124 "EditingTools.c"
+#line 15133 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void) {
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_construct (EDITING_TOOLS_TYPE_ADJUST_TOOL);
-#line 15131 "EditingTools.c"
+#line 15140 "EditingTools.c"
 }
 
 
 EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void) {
 	EditingToolsAdjustTool* result = NULL;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
-#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_adjust_tool_new ();
-#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15144 "EditingTools.c"
+#line 15153 "EditingTools.c"
 }
 
 
 gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling) {
 	gboolean result = FALSE;
-#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15158 "EditingTools.c"
+#line 15167 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_photos_altered ((EditingToolsAdjustTool*) self, items);
-#line 15165 "EditingTools.c"
+#line 15174 "EditingTools.c"
 }
 
 
@@ -15283,351 +15292,351 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	DataCollection* _tmp122_ = NULL;
 	DataCollection* _tmp123_ = NULL;
 	EditingToolsPhotoCanvas* _tmp125_ = NULL;
-#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_container (_tmp0_);
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_adjust_tool_adjust_tool_window_new (_tmp2_);
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->adjust_tool_window = _tmp3_;
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = canvas;
-#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_);
-#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo = _tmp5_;
-#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = photo;
-#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = photo_get_color_adjustments (_tmp6_);
-#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
-#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformations = _tmp7_;
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->transformations;
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = pixel_transformation_bundle_generate_transformer (_tmp8_);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->transformer);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformer = _tmp9_;
-#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = pixel_transformer_new ();
-#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->histogram_transformer);
-#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->histogram_transformer = _tmp10_;
-#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->transformations;
-#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = pixel_transformation_bundle_get_transformation (_tmp11_, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
-#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->adjust_tool_window;
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->histogram_manipulator;
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = expansion_trans;
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = expansion_transformation_get_black_point (_tmp15_);
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rgb_histogram_manipulator_set_left_nub_position (_tmp14_, _tmp16_);
-#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->adjust_tool_window;
-#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_->histogram_manipulator;
-#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = expansion_trans;
-#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = expansion_transformation_get_white_point (_tmp19_);
-#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rgb_histogram_manipulator_set_right_nub_position (_tmp18_, _tmp20_);
-#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->transformations;
-#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = pixel_transformation_bundle_get_transformation (_tmp21_, PIXEL_TRANSFORMATION_TYPE_SHADOWS);
-#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->histogram_transformer;
-#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = shadows_trans;
-#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->priv->adjust_tool_window;
-#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_->shadows_slider;
-#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = shadows_trans;
-#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = shadow_detail_transformation_get_parameter (_tmp27_);
-#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
-#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->transformations;
-#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = pixel_transformation_bundle_get_transformation (_tmp29_, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS);
-#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	highlights_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->priv->histogram_transformer;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = highlights_trans;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->adjust_tool_window;
-#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_->highlights_slider;
-#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = highlights_trans;
-#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = highlight_detail_transformation_get_parameter (_tmp35_);
-#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
-#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = self->priv->transformations;
-#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = pixel_transformation_bundle_get_transformation (_tmp37_, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE);
-#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation);
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->histogram_transformer;
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = temp_trans;
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = self->priv->adjust_tool_window;
-#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = _tmp41_->temperature_slider;
-#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = temp_trans;
-#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp44_ = temperature_transformation_get_parameter (_tmp43_);
-#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_range_get_type (), GtkRange), (gdouble) _tmp44_);
-#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = self->priv->transformations;
-#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = pixel_transformation_bundle_get_transformation (_tmp45_, PIXEL_TRANSFORMATION_TYPE_TINT);
-#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_TINT_TRANSFORMATION, TintTransformation);
-#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp47_ = self->priv->histogram_transformer;
-#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp48_ = tint_trans;
-#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49_ = self->priv->adjust_tool_window;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp50_ = _tmp49_->tint_slider;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp51_ = tint_trans;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp52_ = tint_transformation_get_parameter (_tmp51_);
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_range_get_type (), GtkRange), (gdouble) _tmp52_);
-#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp53_ = self->priv->transformations;
-#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp54_ = pixel_transformation_bundle_get_transformation (_tmp53_, PIXEL_TRANSFORMATION_TYPE_SATURATION);
-#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation);
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp55_ = self->priv->histogram_transformer;
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp56_ = sat_trans;
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp57_ = self->priv->adjust_tool_window;
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp58_ = _tmp57_->saturation_slider;
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp59_ = sat_trans;
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp60_ = saturation_transformation_get_parameter (_tmp59_);
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_range_get_type (), GtkRange), (gdouble) _tmp60_);
-#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2579 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp61_ = self->priv->transformations;
-#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2579 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp62_ = pixel_transformation_bundle_get_transformation (_tmp61_, PIXEL_TRANSFORMATION_TYPE_EXPOSURE);
-#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2579 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation);
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp63_ = self->priv->histogram_transformer;
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp64_ = exposure_trans;
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = self->priv->adjust_tool_window;
-#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp66_ = _tmp65_->exposure_slider;
-#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = exposure_trans;
-#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = exposure_transformation_get_parameter (_tmp67_);
-#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_range_get_type (), GtkRange), (gdouble) _tmp68_);
-#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = self->priv->transformations;
-#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = pixel_transformation_bundle_get_transformation (_tmp69_, PIXEL_TRANSFORMATION_TYPE_CONTRAST);
-#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation);
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = self->priv->histogram_transformer;
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp72_ = contrast_trans;
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp71_, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp73_ = self->priv->adjust_tool_window;
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp74_ = _tmp73_->contrast_slider;
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp75_ = contrast_trans;
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp76_ = contrast_transformation_get_parameter (_tmp75_);
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_range_get_type (), GtkRange), (gdouble) _tmp76_);
-#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp77_ = canvas;
-#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_canvas_handlers (self, _tmp77_);
-#line 2586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (self);
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp78_ = canvas;
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp79_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp78_);
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp80_ = _tmp79_;
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp81_ = gdk_pixbuf_copy (_tmp80_);
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = _tmp81_;
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp80_);
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp82_ = canvas;
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp83_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp82_);
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp84_ = _tmp83_;
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp84_);
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp84_);
-#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp86_ = self->priv->draw_to_pixbuf;
-#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp87_ = gdk_pixbuf_get_width (_tmp86_);
-#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp88_ = _tmp87_;
-#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp88_ == 1) {
-#line 15553 "EditingTools.c"
+#line 15562 "EditingTools.c"
 		GdkPixbuf* _tmp89_ = NULL;
 		gint _tmp90_ = 0;
 		gint _tmp91_ = 0;
-#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp89_ = self->priv->draw_to_pixbuf;
-#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp90_ = gdk_pixbuf_get_height (_tmp89_);
-#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp91_ = _tmp90_;
-#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp85_ = _tmp91_ == 1;
-#line 15565 "EditingTools.c"
+#line 15574 "EditingTools.c"
 	} else {
-#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp85_ = FALSE;
-#line 15569 "EditingTools.c"
+#line 15578 "EditingTools.c"
 	}
-#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp85_) {
-#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->disable_histogram_refresh = TRUE;
-#line 15575 "EditingTools.c"
+#line 15584 "EditingTools.c"
 	}
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp94_ = self->priv->draw_to_pixbuf;
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp95_ = gdk_pixbuf_get_width (_tmp94_);
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp96_ = _tmp95_;
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp97_ = self->priv->draw_to_pixbuf;
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp98_ = gdk_pixbuf_get_height (_tmp97_);
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp99_ = _tmp98_;
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((_tmp96_ * _tmp99_) > 8192) {
-#line 15591 "EditingTools.c"
+#line 15600 "EditingTools.c"
 		GdkPixbuf* _tmp100_ = NULL;
 		gint _tmp101_ = 0;
 		gint _tmp102_ = 0;
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp100_ = self->priv->draw_to_pixbuf;
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp101_ = gdk_pixbuf_get_width (_tmp100_);
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp102_ = _tmp101_;
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp93_ = _tmp102_ > 1;
-#line 15603 "EditingTools.c"
+#line 15612 "EditingTools.c"
 	} else {
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp93_ = FALSE;
-#line 15607 "EditingTools.c"
+#line 15616 "EditingTools.c"
 	}
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp93_) {
-#line 15611 "EditingTools.c"
+#line 15620 "EditingTools.c"
 		GdkPixbuf* _tmp103_ = NULL;
 		gint _tmp104_ = 0;
 		gint _tmp105_ = 0;
-#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp103_ = self->priv->draw_to_pixbuf;
-#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp104_ = gdk_pixbuf_get_height (_tmp103_);
-#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp105_ = _tmp104_;
-#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp92_ = _tmp105_ > 1;
-#line 15623 "EditingTools.c"
+#line 15632 "EditingTools.c"
 	} else {
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp92_ = FALSE;
-#line 15627 "EditingTools.c"
+#line 15636 "EditingTools.c"
 	}
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp92_) {
-#line 15631 "EditingTools.c"
+#line 15640 "EditingTools.c"
 		GdkPixbuf* _tmp106_ = NULL;
 		GdkPixbuf* _tmp107_ = NULL;
 		gint _tmp108_ = 0;
@@ -15636,99 +15645,99 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 		gint _tmp111_ = 0;
 		gint _tmp112_ = 0;
 		GdkPixbuf* _tmp113_ = NULL;
-#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp106_ = self->priv->draw_to_pixbuf;
-#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp107_ = self->priv->draw_to_pixbuf;
-#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp108_ = gdk_pixbuf_get_width (_tmp107_);
-#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp109_ = _tmp108_;
-#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp110_ = self->priv->draw_to_pixbuf;
-#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp111_ = gdk_pixbuf_get_height (_tmp110_);
-#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp112_ = _tmp111_;
-#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp113_ = gdk_pixbuf_scale_simple (_tmp106_, _tmp109_ / 2, _tmp112_ / 2, GDK_INTERP_HYPER);
-#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->histogram_pixbuf = _tmp113_;
-#line 15660 "EditingTools.c"
+#line 15669 "EditingTools.c"
 	} else {
 		GdkPixbuf* _tmp114_ = NULL;
 		GdkPixbuf* _tmp115_ = NULL;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp114_ = self->priv->draw_to_pixbuf;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp115_ = gdk_pixbuf_copy (_tmp114_);
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->histogram_pixbuf = _tmp115_;
-#line 15672 "EditingTools.c"
+#line 15681 "EditingTools.c"
 	}
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp116_ = self->priv->histogram_pixbuf;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp117_ = gdk_pixbuf_copy (_tmp116_);
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->virgin_histogram_pixbuf);
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->virgin_histogram_pixbuf = _tmp117_;
-#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp118_ = canvas;
-#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp119_ = editing_tools_photo_canvas_get_photo (_tmp118_);
-#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp120_ = _tmp119_;
-#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp121_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_DATA_OBJECT, DataObject));
-#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp122_ = _tmp121_;
-#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp120_);
-#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	owner = _tmp122_;
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp123_ = owner;
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp123_ != NULL) {
-#line 15700 "EditingTools.c"
+#line 15709 "EditingTools.c"
 		DataCollection* _tmp124_ = NULL;
-#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp124_ = owner;
-#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (_tmp124_, "items-altered", (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15706 "EditingTools.c"
+#line 15715 "EditingTools.c"
 	}
-#line 2614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp125_ = canvas;
-#line 2614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp125_);
-#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_data_collection_unref0 (owner);
-#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (contrast_trans);
-#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (exposure_trans);
-#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (sat_trans);
-#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (tint_trans);
-#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (temp_trans);
-#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (highlights_trans);
-#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (shadows_trans);
-#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (expansion_trans);
-#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (photo);
-#line 15732 "EditingTools.c"
+#line 15741 "EditingTools.c"
 }
 
 
@@ -15737,17 +15746,17 @@ static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_wi
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
 	EditingToolsEditingToolWindow* _tmp1_ = NULL;
-#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15751 "EditingTools.c"
+#line 15760 "EditingTools.c"
 }
 
 
@@ -15755,13 +15764,13 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 	EditingToolsAdjustTool * self;
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp10_ = NULL;
-#line 2621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 15765 "EditingTools.c"
+#line 15774 "EditingTools.c"
 		DataCollection* owner = NULL;
 		EditingToolsPhotoCanvas* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
@@ -15770,81 +15779,81 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 		DataCollection* _tmp5_ = NULL;
 		DataCollection* _tmp6_ = NULL;
 		EditingToolsPhotoCanvas* _tmp9_ = NULL;
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_;
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_;
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		owner = _tmp5_;
-#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = owner;
-#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 15792 "EditingTools.c"
+#line 15801 "EditingTools.c"
 			DataCollection* _tmp7_ = NULL;
 			guint _tmp8_ = 0U;
-#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = owner;
-#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
-#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15801 "EditingTools.c"
+#line 15810 "EditingTools.c"
 		}
-#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_unbind_canvas_handlers (self, _tmp9_);
-#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 15809 "EditingTools.c"
+#line 15818 "EditingTools.c"
 	}
-#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->adjust_tool_window;
-#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 15815 "EditingTools.c"
+#line 15824 "EditingTools.c"
 		EditingToolsAdjustToolAdjustToolWindow* _tmp11_ = NULL;
 		EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL;
-#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_unbind_window_handlers (self);
-#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = self->priv->adjust_tool_window;
-#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = self->priv->adjust_tool_window;
-#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->adjust_tool_window = NULL;
-#line 15832 "EditingTools.c"
+#line 15841 "EditingTools.c"
 	}
-#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = NULL;
-#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = NULL;
-#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache_length1 = 0;
-#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 15848 "EditingTools.c"
+#line 15857 "EditingTools.c"
 }
 
 
@@ -15853,61 +15862,61 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 	gboolean _tmp0_ = FALSE;
 	EditingToolsPhotoCanvas* _tmp10_ = NULL;
 	GdkPixbuf* _tmp11_ = NULL;
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->suppress_effect_redraw;
-#line 2644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp0_) {
-#line 15865 "EditingTools.c"
+#line 15874 "EditingTools.c"
 		PixelTransformer* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
 		PixelTransformer* _tmp3_ = NULL;
 		GdkPixbuf* _tmp4_ = NULL;
 		GdkPixbuf* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->priv->transformer;
-#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->draw_to_pixbuf;
-#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		pixel_transformer_transform_from_fp (_tmp1_, &self->priv->fp_pixel_cache, &self->priv->fp_pixel_cache_length1, _tmp2_);
-#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->histogram_transformer;
-#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->virgin_histogram_pixbuf;
-#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->histogram_pixbuf;
-#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		pixel_transformer_transform_to_other_pixbuf (_tmp3_, _tmp4_, _tmp5_, NULL);
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->disable_histogram_refresh;
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (!_tmp6_) {
-#line 15890 "EditingTools.c"
+#line 15899 "EditingTools.c"
 			EditingToolsAdjustToolAdjustToolWindow* _tmp7_ = NULL;
 			RGBHistogramManipulator* _tmp8_ = NULL;
 			GdkPixbuf* _tmp9_ = NULL;
-#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = self->priv->adjust_tool_window;
-#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = _tmp7_->histogram_manipulator;
-#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = self->priv->histogram_pixbuf;
-#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			rgb_histogram_manipulator_update_histogram (_tmp8_, _tmp9_);
-#line 15902 "EditingTools.c"
+#line 15911 "EditingTools.c"
 		}
 	}
-#line 2652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->draw_to_pixbuf;
-#line 2652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_pixbuf (_tmp10_, _tmp11_);
-#line 15911 "EditingTools.c"
+#line 15920 "EditingTools.c"
 }
 
 
@@ -15925,71 +15934,71 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 	GdkPixbuf* _tmp7_ = NULL;
 	GdkPixbuf* _tmp8_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = photo;
-#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = photo_has_color_adjustments (_tmp0_);
-#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp1_) {
-#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dimensions_init (&_vala_max_dim, 0, 0);
-#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = NULL;
-#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (max_dim) {
-#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			*max_dim = _vala_max_dim;
-#line 15949 "EditingTools.c"
+#line 15958 "EditingTools.c"
 		}
-#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 15953 "EditingTools.c"
+#line 15962 "EditingTools.c"
 	}
-#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = photo;
-#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
-#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_max_dim = _tmp3_;
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = photo;
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = *scaling;
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = photo_get_pixbuf_with_options (_tmp5_, &_tmp6_, PHOTO_EXCEPTION_ADJUST, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp7_;
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 15975 "EditingTools.c"
+#line 15984 "EditingTools.c"
 	}
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp4_;
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = NULL;
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp8_;
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (max_dim) {
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 15989 "EditingTools.c"
+#line 15998 "EditingTools.c"
 	}
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15993 "EditingTools.c"
+#line 16002 "EditingTools.c"
 }
 
 
@@ -15999,25 +16008,25 @@ static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) {
 	EditingToolsAdjustToolAdjustResetCommand* _tmp1_ = NULL;
 	CommandManager* _tmp2_ = NULL;
 	CommandManager* _tmp3_ = NULL;
-#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
-#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_adjust_tool_adjust_reset_command_new (self, _tmp0_);
-#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp1_;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = app_window_get_command_manager ();
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp3_);
-#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 16021 "EditingTools.c"
+#line 16030 "EditingTools.c"
 }
 
 
@@ -16035,58 +16044,58 @@ static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) {
 	Photo* _tmp10_ = NULL;
 	Photo* _tmp11_ = NULL;
 	Dimensions _tmp12_ = {0};
-#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->suppress_effect_redraw = TRUE;
-#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_editing_tool_get_tool_window (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_photo_canvas_get_photo (_tmp2_);
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->transformations;
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = adjust_colors_single_command_new (_tmp4_, _tmp5_, RESOURCES_ADJUST_LABEL, RESOURCES_ADJUST_TOOLTIP);
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_;
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->draw_to_pixbuf;
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = editing_tools_photo_canvas_get_photo (_tmp9_);
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_;
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp12_);
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command), _tmp8_, &_tmp12_, FALSE);
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp11_);
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 16081 "EditingTools.c"
+#line 16090 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, PixelTransformationBundle* new_transformations) {
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_transformations));
-#line 16090 "EditingTools.c"
+#line 16099 "EditingTools.c"
 	{
 		GeeIterator* _transformation_it = NULL;
 		PixelTransformationBundle* _tmp0_ = NULL;
@@ -16094,56 +16103,56 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust
 		GeeIterable* _tmp2_ = NULL;
 		GeeIterator* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = new_transformations;
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = pixel_transformation_bundle_get_transformations (_tmp0_);
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = _tmp1_;
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = gee_iterable_iterator (_tmp2_);
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = _tmp3_;
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp2_);
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_transformation_it = _tmp4_;
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 16114 "EditingTools.c"
+#line 16123 "EditingTools.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			PixelTransformation* transformation = NULL;
 			GeeIterator* _tmp7_ = NULL;
 			gpointer _tmp8_ = NULL;
 			PixelTransformation* _tmp9_ = NULL;
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp5_ = _transformation_it;
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp6_) {
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 16129 "EditingTools.c"
+#line 16138 "EditingTools.c"
 			}
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = _transformation_it;
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			transformation = (PixelTransformation*) _tmp8_;
-#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = transformation;
-#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_adjust_tool_update_transformation (self, _tmp9_);
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (transformation);
-#line 16143 "EditingTools.c"
+#line 16152 "EditingTools.c"
 		}
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_transformation_it);
-#line 16147 "EditingTools.c"
+#line 16156 "EditingTools.c"
 	}
 }
 
@@ -16161,57 +16170,57 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT
 	PixelTransformationType _tmp8_ = 0;
 	PixelTransformationBundle* _tmp12_ = NULL;
 	PixelTransformation* _tmp13_ = NULL;
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation));
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = new_transformation;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old_transformation = _tmp3_;
-#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->transformer;
-#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = old_transformation;
-#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = new_transformation;
-#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_replace_transformation (_tmp4_, _tmp5_, _tmp6_);
-#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = new_transformation;
-#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
-#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp8_ != PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION) {
-#line 16193 "EditingTools.c"
+#line 16202 "EditingTools.c"
 		PixelTransformer* _tmp9_ = NULL;
 		PixelTransformation* _tmp10_ = NULL;
 		PixelTransformation* _tmp11_ = NULL;
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = self->priv->histogram_transformer;
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = old_transformation;
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = new_transformation;
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		pixel_transformer_replace_transformation (_tmp9_, _tmp10_, _tmp11_);
-#line 16205 "EditingTools.c"
+#line 16214 "EditingTools.c"
 	}
-#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->transformations;
-#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = new_transformation;
-#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformation_bundle_set (_tmp12_, _tmp13_);
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 16215 "EditingTools.c"
+#line 16224 "EditingTools.c"
 }
 
 
@@ -16227,77 +16236,77 @@ static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* se
 	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_ = NULL;
 	CommandManager* _tmp7_ = NULL;
 	CommandManager* _tmp8_ = NULL;
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation));
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (name != NULL);
-#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
-#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = new_transformation;
-#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
-#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_);
-#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old_transformation = _tmp3_;
-#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = new_transformation;
-#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = name;
-#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = editing_tools_adjust_tool_slider_adjustment_command_new (self, old_transformation, _tmp4_, _tmp5_);
-#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp6_;
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = app_window_get_command_manager ();
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_;
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 16267 "EditingTools.c"
+#line 16276 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self) {
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16274 "EditingTools.c"
+#line 16283 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->temperature_scheduler;
-#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16287 "EditingTools.c"
+#line 16296 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("temperature", _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback, self);
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->temperature_scheduler);
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->temperature_scheduler = _tmp1_;
-#line 16295 "EditingTools.c"
+#line 16304 "EditingTools.c"
 	}
-#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->temperature_scheduler;
-#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16301 "EditingTools.c"
+#line 16310 "EditingTools.c"
 }
 
 
@@ -16308,59 +16317,59 @@ static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (Editing
 	gdouble _tmp2_ = 0.0;
 	TemperatureTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->temperature_slider;
-#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = temperature_transformation_new ((gfloat) _tmp2_);
-#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_temp_trans = _tmp3_;
-#line 2717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Temperature");
-#line 2717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_temp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_temp_trans);
-#line 16330 "EditingTools.c"
+#line 16339 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self) {
-#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16337 "EditingTools.c"
+#line 16346 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->tint_scheduler;
-#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16350 "EditingTools.c"
+#line 16359 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("tint", _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback, self);
-#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->tint_scheduler);
-#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tint_scheduler = _tmp1_;
-#line 16358 "EditingTools.c"
+#line 16367 "EditingTools.c"
 	}
-#line 2723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->tint_scheduler;
-#line 2723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16364 "EditingTools.c"
+#line 16373 "EditingTools.c"
 }
 
 
@@ -16371,59 +16380,59 @@ static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAd
 	gdouble _tmp2_ = 0.0;
 	TintTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->tint_slider;
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = tint_transformation_new ((gfloat) _tmp2_);
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_tint_trans = _tmp3_;
-#line 2729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Tint");
-#line 2729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_tint_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_tint_trans);
-#line 16393 "EditingTools.c"
+#line 16402 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self) {
-#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 16400 "EditingTools.c"
+#line 16409 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->contrast_scheduler;
-#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16413 "EditingTools.c"
+#line 16422 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("contrast", _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback, self);
-#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->contrast_scheduler);
-#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->contrast_scheduler = _tmp1_;
-#line 16421 "EditingTools.c"
+#line 16430 "EditingTools.c"
 	}
-#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->contrast_scheduler;
-#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16427 "EditingTools.c"
+#line 16436 "EditingTools.c"
 }
 
 
@@ -16434,59 +16443,59 @@ static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToo
 	gdouble _tmp2_ = 0.0;
 	ContrastTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->contrast_slider;
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = contrast_transformation_new ((gfloat) _tmp2_);
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp3_;
-#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Contrast");
-#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16456 "EditingTools.c"
+#line 16465 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self) {
-#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16463 "EditingTools.c"
+#line 16472 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->saturation_scheduler;
-#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16476 "EditingTools.c"
+#line 16485 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("saturation", _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback, self);
-#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->saturation_scheduler);
-#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->saturation_scheduler = _tmp1_;
-#line 16484 "EditingTools.c"
+#line 16493 "EditingTools.c"
 	}
-#line 2749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->saturation_scheduler;
-#line 2749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16490 "EditingTools.c"
+#line 16499 "EditingTools.c"
 }
 
 
@@ -16497,59 +16506,59 @@ static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingT
 	gdouble _tmp2_ = 0.0;
 	SaturationTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->saturation_slider;
-#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = saturation_transformation_new ((gfloat) _tmp2_);
-#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_sat_trans = _tmp3_;
-#line 2755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Saturation");
-#line 2755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_sat_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_sat_trans);
-#line 16519 "EditingTools.c"
+#line 16528 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self) {
-#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16526 "EditingTools.c"
+#line 16535 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->exposure_scheduler;
-#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16539 "EditingTools.c"
+#line 16548 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("exposure", _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback, self);
-#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->exposure_scheduler);
-#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->exposure_scheduler = _tmp1_;
-#line 16547 "EditingTools.c"
+#line 16556 "EditingTools.c"
 	}
-#line 2762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->exposure_scheduler;
-#line 2762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16553 "EditingTools.c"
+#line 16562 "EditingTools.c"
 }
 
 
@@ -16560,59 +16569,59 @@ static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToo
 	gdouble _tmp2_ = 0.0;
 	ExposureTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->exposure_slider;
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = exposure_transformation_new ((gfloat) _tmp2_);
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp3_;
-#line 2768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Exposure");
-#line 2768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16582 "EditingTools.c"
+#line 16591 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self) {
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16589 "EditingTools.c"
+#line 16598 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->shadows_scheduler;
-#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16602 "EditingTools.c"
+#line 16611 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("shadows", _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback, self);
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->shadows_scheduler);
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->shadows_scheduler = _tmp1_;
-#line 16610 "EditingTools.c"
+#line 16619 "EditingTools.c"
 	}
-#line 2775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->shadows_scheduler;
-#line 2775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16616 "EditingTools.c"
+#line 16625 "EditingTools.c"
 }
 
 
@@ -16623,59 +16632,59 @@ static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingTool
 	gdouble _tmp2_ = 0.0;
 	ShadowDetailTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->shadows_slider;
-#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = shadow_detail_transformation_new ((gfloat) _tmp2_);
-#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_shadows_trans = _tmp3_;
-#line 2781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Shadows");
-#line 2781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_shadows_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_shadows_trans);
-#line 16645 "EditingTools.c"
+#line 16654 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self) {
-#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16652 "EditingTools.c"
+#line 16661 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->highlights_scheduler;
-#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16665 "EditingTools.c"
+#line 16674 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("highlights", _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback, self);
-#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
-#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->highlights_scheduler = _tmp1_;
-#line 16673 "EditingTools.c"
+#line 16682 "EditingTools.c"
 	}
-#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->highlights_scheduler;
-#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16679 "EditingTools.c"
+#line 16688 "EditingTools.c"
 }
 
 
@@ -16686,25 +16695,25 @@ static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingT
 	gdouble _tmp2_ = 0.0;
 	HighlightDetailTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->highlights_slider;
-#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = highlight_detail_transformation_new ((gfloat) _tmp2_);
-#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_highlights_trans = _tmp3_;
-#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Highlights");
-#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_highlights_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_highlights_trans);
-#line 16708 "EditingTools.c"
+#line 16717 "EditingTools.c"
 }
 
 
@@ -16720,35 +16729,35 @@ static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjus
 	ExpansionTransformation* new_exp_trans = NULL;
 	ExpansionTransformation* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->histogram_manipulator;
-#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = rgb_histogram_manipulator_get_left_nub_position (_tmp1_);
-#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	expansion_black_point = _tmp2_;
-#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->adjust_tool_window;
-#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->histogram_manipulator;
-#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = rgb_histogram_manipulator_get_right_nub_position (_tmp4_);
-#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	expansion_white_point = _tmp5_;
-#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = expansion_transformation_new_from_extrema (expansion_black_point, expansion_white_point);
-#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp6_;
-#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _ ("Contrast Expansion");
-#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp7_);
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16752 "EditingTools.c"
+#line 16761 "EditingTools.c"
 }
 
 
@@ -16760,33 +16769,33 @@ static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool*
 	EditingToolsPhotoCanvas* _tmp4_ = NULL;
 	GdkPixbuf* _tmp5_ = NULL;
 	GdkPixbuf* _tmp6_ = NULL;
-#line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp0_);
-#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gdk_pixbuf_copy (_tmp2_);
-#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = _tmp3_;
-#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp4_);
-#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp6_);
-#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp6_);
-#line 16790 "EditingTools.c"
+#line 16799 "EditingTools.c"
 }
 
 
@@ -16799,199 +16808,199 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 	gboolean _tmp3_ = FALSE;
 	GdkEventButton* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
-#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
-#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = widget;
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_scale_get_type (), GtkScale));
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source = _tmp1_;
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = event;
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_->button;
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ == ((guint) 1)) {
-#line 16821 "EditingTools.c"
+#line 16830 "EditingTools.c"
 		GdkEventButton* _tmp6_ = NULL;
 		GdkEventType _tmp7_ = 0;
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = event;
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_->type;
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ == GDK_BUTTON_PRESS;
-#line 16830 "EditingTools.c"
+#line 16839 "EditingTools.c"
 	} else {
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 16834 "EditingTools.c"
+#line 16843 "EditingTools.c"
 	}
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_) {
-#line 16838 "EditingTools.c"
+#line 16847 "EditingTools.c"
 		GdkEventButton* _tmp8_ = NULL;
 		GdkModifierType _tmp9_ = 0;
 		gboolean _tmp10_ = FALSE;
-#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->state;
-#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = has_only_key_modifier (_tmp9_, GDK_CONTROL_MASK);
-#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = _tmp10_;
-#line 16850 "EditingTools.c"
+#line 16859 "EditingTools.c"
 	} else {
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = FALSE;
-#line 16854 "EditingTools.c"
+#line 16863 "EditingTools.c"
 	}
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_) {
-#line 16858 "EditingTools.c"
+#line 16867 "EditingTools.c"
 		GtkScale* _tmp11_ = NULL;
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = source;
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), (gdouble) 0);
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (source);
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 16870 "EditingTools.c"
+#line 16879 "EditingTools.c"
 	}
-#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (source);
-#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16878 "EditingTools.c"
+#line 16887 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_canvas_resize ((EditingToolsAdjustTool*) self);
-#line 16885 "EditingTools.c"
+#line 16894 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16899 "EditingTools.c"
+#line 16908 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16916 "EditingTools.c"
+#line 16925 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_ok ((EditingToolsAdjustTool*) self);
-#line 16923 "EditingTools.c"
+#line 16932 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_reset ((EditingToolsAdjustTool*) self);
-#line 16930 "EditingTools.c"
+#line 16939 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16937 "EditingTools.c"
+#line 16946 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 16944 "EditingTools.c"
+#line 16953 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16951 "EditingTools.c"
+#line 16960 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16958 "EditingTools.c"
+#line 16967 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16965 "EditingTools.c"
+#line 16974 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16972 "EditingTools.c"
+#line 16981 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16979 "EditingTools.c"
+#line 16988 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, gpointer self) {
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_histogram_constraint ((EditingToolsAdjustTool*) self);
-#line 16986 "EditingTools.c"
+#line 16995 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_adjust_tool_on_hscale_reset ((EditingToolsAdjustTool*) self, _sender, event);
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16995 "EditingTools.c"
+#line 17004 "EditingTools.c"
 }
 
 
@@ -17032,117 +17041,117 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo
 	GtkScale* _tmp33_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp34_ = NULL;
 	GtkScale* _tmp35_ = NULL;
-#line 2834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->ok_button;
-#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "clicked", (GCallback) _editing_tools_adjust_tool_on_ok_gtk_button_clicked, self);
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->adjust_tool_window;
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->reset_button;
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp3_, "clicked", (GCallback) _editing_tools_adjust_tool_on_reset_gtk_button_clicked, self);
-#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->adjust_tool_window;
-#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_->cancel_button;
-#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp5_, "clicked", (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->adjust_tool_window;
-#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->exposure_slider;
-#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed, self);
-#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->adjust_tool_window;
-#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_->contrast_slider;
-#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed, self);
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->adjust_tool_window;
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_->saturation_slider;
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed, self);
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->adjust_tool_window;
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_->tint_slider;
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed, self);
-#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->adjust_tool_window;
-#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_->temperature_slider;
-#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed, self);
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->adjust_tool_window;
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_->shadows_slider;
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed, self);
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->adjust_tool_window;
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_->highlights_slider;
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed, self);
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->adjust_tool_window;
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_->histogram_manipulator;
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp21_, "nub-position-changed", (GCallback) _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed, self);
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->adjust_tool_window;
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_->saturation_slider;
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->adjust_tool_window;
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_->exposure_slider;
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = self->priv->adjust_tool_window;
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_->contrast_slider;
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = self->priv->adjust_tool_window;
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = _tmp28_->tint_slider;
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = self->priv->adjust_tool_window;
-#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = _tmp30_->temperature_slider;
-#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = self->priv->adjust_tool_window;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = _tmp32_->shadows_slider;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = self->priv->adjust_tool_window;
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = _tmp34_->highlights_slider;
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 17146 "EditingTools.c"
+#line 17155 "EditingTools.c"
 }
 
 
@@ -17201,153 +17210,153 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust
 	EditingToolsAdjustToolAdjustToolWindow* _tmp51_ = NULL;
 	GtkScale* _tmp52_ = NULL;
 	guint _tmp53_ = 0U;
-#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->ok_button;
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp2_, NULL, FALSE);
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_ok_gtk_button_clicked, self);
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->adjust_tool_window;
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->reset_button;
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp5_, NULL, FALSE);
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_reset_gtk_button_clicked, self);
-#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->adjust_tool_window;
-#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->cancel_button;
-#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp8_, NULL, FALSE);
-#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->adjust_tool_window;
-#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_->exposure_slider;
-#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp11_, NULL, FALSE);
-#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed, self);
-#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->adjust_tool_window;
-#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_->contrast_slider;
-#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp14_, NULL, FALSE);
-#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed, self);
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->adjust_tool_window;
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_->saturation_slider;
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp17_, NULL, FALSE);
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed, self);
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->adjust_tool_window;
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_->tint_slider;
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp20_, NULL, FALSE);
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed, self);
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->adjust_tool_window;
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_->temperature_slider;
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp23_, NULL, FALSE);
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed, self);
-#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->adjust_tool_window;
-#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_->shadows_slider;
-#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp26_, NULL, FALSE);
-#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed, self);
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = self->priv->adjust_tool_window;
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = _tmp27_->highlights_slider;
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp29_, NULL, FALSE);
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp29_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed, self);
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = self->priv->adjust_tool_window;
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = _tmp30_->histogram_manipulator;
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("nub-position-changed", TYPE_RGB_HISTOGRAM_MANIPULATOR, &_tmp32_, NULL, FALSE);
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed, self);
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->adjust_tool_window;
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_->saturation_slider;
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp35_, NULL, FALSE);
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp35_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = self->priv->adjust_tool_window;
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = _tmp36_->exposure_slider;
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp38_, NULL, FALSE);
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp38_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->adjust_tool_window;
-#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = _tmp39_->contrast_slider;
-#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp41_, NULL, FALSE);
-#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp41_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = self->priv->adjust_tool_window;
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = _tmp42_->tint_slider;
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp44_, NULL, FALSE);
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = self->priv->adjust_tool_window;
-#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = _tmp45_->temperature_slider;
-#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp47_, NULL, FALSE);
-#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp47_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp48_ = self->priv->adjust_tool_window;
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49_ = _tmp48_->shadows_slider;
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp50_, NULL, FALSE);
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp50_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp51_ = self->priv->adjust_tool_window;
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp52_ = _tmp51_->highlights_slider;
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp53_, NULL, FALSE);
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp53_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 17351 "EditingTools.c"
+#line 17360 "EditingTools.c"
 }
 
 
@@ -17361,37 +17370,37 @@ gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) {
 	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp4_ = NULL;
 	CommandManager* _tmp5_ = NULL;
 	CommandManager* _tmp6_ = NULL;
-#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2883 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_);
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_adjust_tool_adjust_enhance_command_new (self, _tmp2_);
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp4_;
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = app_window_get_command_manager ();
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp6_);
-#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 17395 "EditingTools.c"
+#line 17404 "EditingTools.c"
 }
 
 
@@ -17409,68 +17418,68 @@ static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool*
 	PixelTransformationBundle* _tmp9_ = NULL;
 	PixelTransformationBundle* _tmp10_ = NULL;
 	PixelTransformationBundle* _tmp11_ = NULL;
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = map;
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = !_tmp4_;
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_) {
-#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 17435 "EditingTools.c"
+#line 17444 "EditingTools.c"
 	}
-#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = editing_tools_photo_canvas_get_photo (_tmp6_);
-#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_;
-#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = photo_get_color_adjustments (_tmp8_);
-#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_;
-#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp8_);
-#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	adjustments = _tmp10_;
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = adjustments;
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (self, _tmp11_);
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (adjustments);
-#line 17457 "EditingTools.c"
+#line 17466 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, PixelTransformationBundle* new_adjustments) {
 	PixelTransformationBundle* _tmp0_ = NULL;
 	EditingToolsPhotoCanvas* _tmp11_ = NULL;
-#line 2893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_adjustments));
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_unbind_window_handlers (self);
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = new_adjustments;
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformations (self, _tmp0_);
-#line 17474 "EditingTools.c"
+#line 17483 "EditingTools.c"
 	{
 		GeeIterator* _adjustment_it = NULL;
 		PixelTransformationBundle* _tmp1_ = NULL;
@@ -17478,106 +17487,106 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 		GeeIterable* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = new_adjustments;
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = pixel_transformation_bundle_get_transformations (_tmp1_);
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_;
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = gee_iterable_iterator (_tmp3_);
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_;
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_adjustment_it = _tmp5_;
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 17498 "EditingTools.c"
+#line 17507 "EditingTools.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			PixelTransformation* adjustment = NULL;
 			GeeIterator* _tmp8_ = NULL;
 			gpointer _tmp9_ = NULL;
 			PixelTransformation* _tmp10_ = NULL;
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = _adjustment_it;
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp7_) {
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 17513 "EditingTools.c"
+#line 17522 "EditingTools.c"
 			}
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = _adjustment_it;
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			adjustment = (PixelTransformation*) _tmp9_;
-#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = adjustment;
-#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_adjust_tool_update_slider (self, _tmp10_);
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (adjustment);
-#line 17527 "EditingTools.c"
+#line 17536 "EditingTools.c"
 		}
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_adjustment_it);
-#line 17531 "EditingTools.c"
+#line 17540 "EditingTools.c"
 	}
-#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (self);
-#line 2902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp11_);
-#line 17539 "EditingTools.c"
+#line 17548 "EditingTools.c"
 }
 
 
 static gpointer _pixel_transformation_ref0 (gpointer self) {
-#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? pixel_transformation_ref (self) : NULL;
-#line 17546 "EditingTools.c"
+#line 17555 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, PixelTransformation* transformation) {
 	PixelTransformation* _tmp0_ = NULL;
 	PixelTransformationType _tmp1_ = 0;
-#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (transformation));
-#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = transformation;
-#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = pixel_transformation_get_transformation_type (_tmp0_);
-#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	switch (_tmp1_) {
-#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION:
-#line 17565 "EditingTools.c"
+#line 17574 "EditingTools.c"
 		{
 			ExpansionTransformation* expansion = NULL;
 			PixelTransformation* _tmp2_ = NULL;
 			ExpansionTransformation* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
-#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = transformation;
-#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp3_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation));
-#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			expansion = _tmp3_;
-#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp4_ = self->priv->disable_histogram_refresh;
-#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp4_) {
-#line 17581 "EditingTools.c"
+#line 17590 "EditingTools.c"
 				EditingToolsAdjustToolAdjustToolWindow* _tmp5_ = NULL;
 				RGBHistogramManipulator* _tmp6_ = NULL;
 				ExpansionTransformation* _tmp7_ = NULL;
@@ -17586,199 +17595,199 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 				RGBHistogramManipulator* _tmp10_ = NULL;
 				ExpansionTransformation* _tmp11_ = NULL;
 				gint _tmp12_ = 0;
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp5_ = self->priv->adjust_tool_window;
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp6_ = _tmp5_->histogram_manipulator;
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp7_ = expansion;
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp8_ = expansion_transformation_get_black_point (_tmp7_);
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				rgb_histogram_manipulator_set_left_nub_position (_tmp6_, _tmp8_);
-#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp9_ = self->priv->adjust_tool_window;
-#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp10_ = _tmp9_->histogram_manipulator;
-#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp11_ = expansion;
-#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp12_ = expansion_transformation_get_white_point (_tmp11_);
-#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				rgb_histogram_manipulator_set_right_nub_position (_tmp10_, _tmp12_);
-#line 17610 "EditingTools.c"
+#line 17619 "EditingTools.c"
 			}
-#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (expansion);
-#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17616 "EditingTools.c"
+#line 17625 "EditingTools.c"
 		}
-#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_SHADOWS:
-#line 17620 "EditingTools.c"
+#line 17629 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp13_ = NULL;
 			GtkScale* _tmp14_ = NULL;
 			PixelTransformation* _tmp15_ = NULL;
 			gfloat _tmp16_ = 0.0F;
-#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = self->priv->adjust_tool_window;
-#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = _tmp13_->shadows_slider;
-#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp15_ = transformation;
-#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp16_ = shadow_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation));
-#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_range_get_type (), GtkRange), (gdouble) _tmp16_);
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17638 "EditingTools.c"
+#line 17647 "EditingTools.c"
 		}
-#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_CONTRAST:
-#line 17642 "EditingTools.c"
+#line 17651 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp17_ = NULL;
 			GtkScale* _tmp18_ = NULL;
 			PixelTransformation* _tmp19_ = NULL;
 			gfloat _tmp20_ = 0.0F;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp17_ = self->priv->adjust_tool_window;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = _tmp17_->contrast_slider;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp19_ = transformation;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = contrast_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation));
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_range_get_type (), GtkRange), (gdouble) _tmp20_);
-#line 2928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17660 "EditingTools.c"
+#line 17669 "EditingTools.c"
 		}
-#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS:
-#line 17664 "EditingTools.c"
+#line 17673 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp21_ = NULL;
 			GtkScale* _tmp22_ = NULL;
 			PixelTransformation* _tmp23_ = NULL;
 			gfloat _tmp24_ = 0.0F;
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp21_ = self->priv->adjust_tool_window;
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp22_ = _tmp21_->highlights_slider;
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp23_ = transformation;
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp24_ = highlight_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation));
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), (gdouble) _tmp24_);
-#line 2933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17682 "EditingTools.c"
+#line 17691 "EditingTools.c"
 		}
-#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_EXPOSURE:
-#line 17686 "EditingTools.c"
+#line 17695 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp25_ = NULL;
 			GtkScale* _tmp26_ = NULL;
 			PixelTransformation* _tmp27_ = NULL;
 			gfloat _tmp28_ = 0.0F;
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp25_ = self->priv->adjust_tool_window;
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp26_ = _tmp25_->exposure_slider;
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp27_ = transformation;
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp28_ = exposure_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation));
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
-#line 2938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17704 "EditingTools.c"
+#line 17713 "EditingTools.c"
 		}
-#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_SATURATION:
-#line 17708 "EditingTools.c"
+#line 17717 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp29_ = NULL;
 			GtkScale* _tmp30_ = NULL;
 			PixelTransformation* _tmp31_ = NULL;
 			gfloat _tmp32_ = 0.0F;
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp29_ = self->priv->adjust_tool_window;
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp30_ = _tmp29_->saturation_slider;
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp31_ = transformation;
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = saturation_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation));
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_range_get_type (), GtkRange), (gdouble) _tmp32_);
-#line 2943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17726 "EditingTools.c"
+#line 17735 "EditingTools.c"
 		}
-#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TINT:
-#line 17730 "EditingTools.c"
+#line 17739 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp33_ = NULL;
 			GtkScale* _tmp34_ = NULL;
 			PixelTransformation* _tmp35_ = NULL;
 			gfloat _tmp36_ = 0.0F;
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp33_ = self->priv->adjust_tool_window;
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = _tmp33_->tint_slider;
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp35_ = transformation;
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp36_ = tint_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_TINT_TRANSFORMATION, TintTransformation));
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
-#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17748 "EditingTools.c"
+#line 17757 "EditingTools.c"
 		}
-#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TEMPERATURE:
-#line 17752 "EditingTools.c"
+#line 17761 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp37_ = NULL;
 			GtkScale* _tmp38_ = NULL;
 			PixelTransformation* _tmp39_ = NULL;
 			gfloat _tmp40_ = 0.0F;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp37_ = self->priv->adjust_tool_window;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp38_ = _tmp37_->temperature_slider;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp39_ = transformation;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp40_ = temperature_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation));
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_range_get_type (), GtkRange), (gdouble) _tmp40_);
-#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17770 "EditingTools.c"
+#line 17779 "EditingTools.c"
 		}
 		default:
 		{
 			PixelTransformation* _tmp41_ = NULL;
 			PixelTransformationType _tmp42_ = 0;
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp41_ = transformation;
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp42_ = pixel_transformation_get_transformation_type (_tmp41_);
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			g_error ("EditingTools.vala:2956: Unknown adjustment: %d", (gint) _tmp42_);
-#line 17782 "EditingTools.c"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			g_error ("EditingTools.vala:2961: Unknown adjustment: %d", (gint) _tmp42_);
+#line 17791 "EditingTools.c"
 		}
 	}
 }
@@ -17807,75 +17816,75 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 	gfloat* _tmp12_ = NULL;
 	gint cache_pixel_index = 0;
 	gfloat INV_255 = 0.0F;
-#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (source));
-#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2966 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = source;
-#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2966 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = gdk_pixbuf_get_width (_tmp0_);
-#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2966 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_width = _tmp1_;
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = source;
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gdk_pixbuf_get_height (_tmp2_);
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_height = _tmp3_;
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = source;
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_);
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_num_channels = _tmp5_;
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = source;
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = gdk_pixbuf_get_rowstride (_tmp6_);
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_rowstride = _tmp7_;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = source;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = gdk_pixbuf_get_pixels (_tmp8_);
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_pixels = _tmp9_;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_pixels_length1 = -1;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_source_pixels_size_ = source_pixels_length1;
-#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = source_width;
-#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = source_height;
-#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = g_new0 (gfloat, (3 * _tmp10_) * _tmp11_);
-#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = _tmp12_;
-#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache_length1 = (3 * _tmp10_) * _tmp11_;
-#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cache_pixel_index = 0;
-#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	INV_255 = 1.0f / 255.0f;
-#line 17867 "EditingTools.c"
+#line 17876 "EditingTools.c"
 	{
 		gint j = 0;
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		j = 0;
-#line 17872 "EditingTools.c"
+#line 17881 "EditingTools.c"
 		{
 			gboolean _tmp13_ = FALSE;
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = TRUE;
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 17879 "EditingTools.c"
+#line 17888 "EditingTools.c"
 				gint _tmp15_ = 0;
 				gint _tmp16_ = 0;
 				gint row_start_index = 0;
@@ -17885,58 +17894,58 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 				gint _tmp19_ = 0;
 				gint _tmp20_ = 0;
 				gint _tmp21_ = 0;
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!_tmp13_) {
-#line 17891 "EditingTools.c"
+#line 17900 "EditingTools.c"
 					gint _tmp14_ = 0;
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp14_ = j;
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					j = _tmp14_ + 1;
-#line 17897 "EditingTools.c"
+#line 17906 "EditingTools.c"
 				}
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp13_ = FALSE;
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp15_ = j;
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp16_ = source_height;
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!(_tmp15_ < _tmp16_)) {
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 17909 "EditingTools.c"
+#line 17918 "EditingTools.c"
 				}
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp17_ = j;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp18_ = source_rowstride;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				row_start_index = _tmp17_ * _tmp18_;
-#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp19_ = row_start_index;
-#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp20_ = source_width;
-#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp21_ = source_num_channels;
-#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				row_end_index = _tmp19_ + (_tmp20_ * _tmp21_);
-#line 17925 "EditingTools.c"
+#line 17934 "EditingTools.c"
 				{
 					gint i = 0;
 					gint _tmp22_ = 0;
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp22_ = row_start_index;
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					i = _tmp22_;
-#line 17933 "EditingTools.c"
+#line 17942 "EditingTools.c"
 					{
 						gboolean _tmp23_ = FALSE;
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp23_ = TRUE;
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						while (TRUE) {
-#line 17940 "EditingTools.c"
+#line 17949 "EditingTools.c"
 							gint _tmp26_ = 0;
 							gint _tmp27_ = 0;
 							gfloat* _tmp28_ = NULL;
@@ -17966,98 +17975,98 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 							guchar _tmp46_ = '\0';
 							gfloat _tmp47_ = 0.0F;
 							gfloat _tmp48_ = 0.0F;
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							if (!_tmp23_) {
-#line 17972 "EditingTools.c"
+#line 17981 "EditingTools.c"
 								gint _tmp24_ = 0;
 								gint _tmp25_ = 0;
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								_tmp24_ = i;
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								_tmp25_ = source_num_channels;
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								i = _tmp24_ + _tmp25_;
-#line 17981 "EditingTools.c"
+#line 17990 "EditingTools.c"
 							}
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp23_ = FALSE;
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp26_ = i;
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp27_ = row_end_index;
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							if (!(_tmp26_ < _tmp27_)) {
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								break;
-#line 17993 "EditingTools.c"
+#line 18002 "EditingTools.c"
 							}
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp28_ = self->priv->fp_pixel_cache;
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp28__length1 = self->priv->fp_pixel_cache_length1;
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp29_ = cache_pixel_index;
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							cache_pixel_index = _tmp29_ + 1;
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp30_ = source_pixels;
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp30__length1 = source_pixels_length1;
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp31_ = i;
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp32_ = _tmp30_[_tmp31_];
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp33_ = INV_255;
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp28_[_tmp29_] = ((gfloat) _tmp32_) * _tmp33_;
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp34_ = _tmp28_[_tmp29_];
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp35_ = self->priv->fp_pixel_cache;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp35__length1 = self->priv->fp_pixel_cache_length1;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp36_ = cache_pixel_index;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							cache_pixel_index = _tmp36_ + 1;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp37_ = source_pixels;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp37__length1 = source_pixels_length1;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp38_ = i;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp39_ = _tmp37_[_tmp38_ + 1];
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp40_ = INV_255;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp35_[_tmp36_] = ((gfloat) _tmp39_) * _tmp40_;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp41_ = _tmp35_[_tmp36_];
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp42_ = self->priv->fp_pixel_cache;
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp42__length1 = self->priv->fp_pixel_cache_length1;
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp43_ = cache_pixel_index;
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							cache_pixel_index = _tmp43_ + 1;
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp44_ = source_pixels;
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp44__length1 = source_pixels_length1;
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp45_ = i;
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp46_ = _tmp44_[_tmp45_ + 2];
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp47_ = INV_255;
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp42_[_tmp43_] = ((gfloat) _tmp46_) * _tmp47_;
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp48_ = _tmp42_[_tmp43_];
-#line 18061 "EditingTools.c"
+#line 18070 "EditingTools.c"
 						}
 					}
 				}
@@ -18077,73 +18086,73 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 	const gchar* _tmp4_ = NULL;
 	GdkEventKey* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = event;
-#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 18095 "EditingTools.c"
+#line 18104 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
 		const gchar* _tmp7_ = NULL;
-#line 2984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
-#line 2984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_->keyval;
-#line 2984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 2984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 18108 "EditingTools.c"
+#line 18117 "EditingTools.c"
 	}
-#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 18114 "EditingTools.c"
+#line 18123 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
 		const gchar* _tmp10_ = NULL;
-#line 2985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 2985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->keyval;
-#line 2985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 2985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 18127 "EditingTools.c"
+#line 18136 "EditingTools.c"
 	}
-#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 2986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_on_ok (self);
-#line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18137 "EditingTools.c"
+#line 18146 "EditingTools.c"
 	}
-#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
-#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp12_;
-#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18147 "EditingTools.c"
+#line 18156 "EditingTools.c"
 }
 
 
@@ -18213,329 +18222,329 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 	GtkBox* _tmp51_ = NULL;
 	RGBHistogramManipulator* _tmp52_ = NULL;
 	RGBHistogramManipulator* _tmp53_ = NULL;
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = container;
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = (GtkGrid*) gtk_grid_new ();
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	slider_organizer = _tmp1_;
-#line 2241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_set_column_homogeneous (slider_organizer, FALSE);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_set_row_spacing (slider_organizer, (guint) 12);
-#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_set_column_spacing (slider_organizer, (guint) 12);
-#line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
-#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
-#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _ ("Exposure:");
-#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp2_);
-#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	exposure_label = _tmp3_;
-#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), 0, 0, 1, 1);
-#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->exposure_slider;
-#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1);
-#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->exposure_slider;
-#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->exposure_slider;
-#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp6_, FALSE);
-#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->exposure_slider;
-#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _ ("Contrast:");
-#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp8_);
-#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp9_);
-#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	contrast_label = _tmp9_;
-#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), 0, 1, 1, 1);
-#line 2260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->contrast_slider;
-#line 2260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1);
-#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->contrast_slider;
-#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->contrast_slider;
-#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp12_, FALSE);
-#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->contrast_slider;
-#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _ ("Saturation:");
-#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp14_);
-#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp15_);
-#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	saturation_label = _tmp15_;
-#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), 0, 2, 1, 1);
-#line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->saturation_slider;
-#line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1);
-#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->saturation_slider;
-#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->saturation_slider;
-#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp18_, FALSE);
-#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = self->saturation_slider;
-#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _ ("Tint:");
-#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp20_);
-#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp21_);
-#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	tint_label = _tmp21_;
-#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), 0, 3, 1, 1);
-#line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->tint_slider;
-#line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1);
-#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->tint_slider;
-#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->tint_slider;
-#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp24_, FALSE);
-#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->tint_slider;
-#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _ ("Temperature:");
-#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp26_);
-#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp27_);
-#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	temperature_label = _tmp27_;
-#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), 0, 4, 1, 1);
-#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = self->temperature_slider;
-#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1);
-#line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->temperature_slider;
-#line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = self->temperature_slider;
-#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp30_, FALSE);
-#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->temperature_slider;
-#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _ ("Shadows:");
-#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp32_);
-#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp33_);
-#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	shadows_label = _tmp33_;
-#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), 0, 5, 1, 1);
-#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = self->shadows_slider;
-#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1);
-#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = self->shadows_slider;
-#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = self->shadows_slider;
-#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp36_, FALSE);
-#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = self->shadows_slider;
-#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = _ ("Highlights:");
-#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp38_);
-#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp39_);
-#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	highlights_label = _tmp39_;
-#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), 0, 6, 1, 1);
-#line 2306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = self->highlights_slider;
-#line 2306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1);
-#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = self->highlights_slider;
-#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = self->highlights_slider;
-#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp42_, FALSE);
-#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp43_);
-#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	button_layouter = _tmp43_;
-#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_set_homogeneous (button_layouter, TRUE);
-#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp44_ = self->cancel_button;
-#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = self->reset_button;
-#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = self->ok_button;
-#line 2314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp47_ = self->histogram_manipulator;
-#line 2316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), 12);
-#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp48_ = self->histogram_manipulator;
-#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), 12);
-#line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49_ = self->histogram_manipulator;
-#line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), 12);
-#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp50_ = self->histogram_manipulator;
-#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), 8);
-#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp51_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp51_);
-#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pane_layouter = _tmp51_;
-#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp52_ = self->histogram_manipulator;
-#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget));
-#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget));
-#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (button_layouter, gtk_widget_get_type (), GtkWidget));
-#line 2325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp53_ = self->histogram_manipulator;
-#line 2325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
-#line 2327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_widget_get_type (), GtkWidget));
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (pane_layouter);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (button_layouter);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (highlights_label);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (shadows_label);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (temperature_label);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (tint_label);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (saturation_label);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (contrast_label);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (exposure_label);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (slider_organizer);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18523 "EditingTools.c"
+#line 18532 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container) {
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_tool_window_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, container);
-#line 18530 "EditingTools.c"
+#line 18539 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_window_class_init (EditingToolsAdjustToolAdjustToolWindowClass * klass) {
-#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_window_parent_class = g_type_class_peek_parent (klass);
-#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_window_finalize;
-#line 18539 "EditingTools.c"
+#line 18548 "EditingTools.c"
 }
 
 
@@ -18552,107 +18561,107 @@ static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingT
 	GtkButton* _tmp9_ = NULL;
 	GtkButton* _tmp10_ = NULL;
 	RGBHistogramManipulator* _tmp11_ = NULL;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EXPOSURE_TRANSFORMATION_MIN_PARAMETER, (gdouble) EXPOSURE_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp0_);
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->exposure_slider = _tmp0_;
-#line 2212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) CONTRAST_TRANSFORMATION_MIN_PARAMETER, (gdouble) CONTRAST_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->contrast_slider = _tmp1_;
-#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) SATURATION_TRANSFORMATION_MIN_PARAMETER, (gdouble) SATURATION_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->saturation_slider = _tmp2_;
-#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) TINT_TRANSFORMATION_MIN_PARAMETER, (gdouble) TINT_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->tint_slider = _tmp3_;
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) TEMPERATURE_TRANSFORMATION_MIN_PARAMETER, (gdouble) TEMPERATURE_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp4_);
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->temperature_slider = _tmp4_;
-#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) SHADOW_DETAIL_TRANSFORMATION_MIN_PARAMETER, (gdouble) SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp5_);
-#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->shadows_slider = _tmp5_;
-#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER, (gdouble) HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp6_);
-#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->highlights_slider = _tmp6_;
-#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_OK_LABEL);
-#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp7_);
-#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ok_button = _tmp7_;
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _ ("_Reset");
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp8_);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp9_);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->reset_button = _tmp9_;
-#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp10_);
-#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->cancel_button = _tmp10_;
-#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = rgb_histogram_manipulator_new ();
-#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp11_);
-#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->histogram_manipulator = _tmp11_;
-#line 18624 "EditingTools.c"
+#line 18633 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject* obj) {
 	EditingToolsAdjustToolAdjustToolWindow * self;
-#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, EditingToolsAdjustToolAdjustToolWindow);
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->exposure_slider);
-#line 2212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->contrast_slider);
-#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->saturation_slider);
-#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->tint_slider);
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->temperature_slider);
-#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->shadows_slider);
-#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->highlights_slider);
-#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->ok_button);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->reset_button);
-#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->cancel_button);
-#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->histogram_manipulator);
-#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_window_parent_class)->finalize (obj);
-#line 18656 "EditingTools.c"
+#line 18665 "EditingTools.c"
 }
 
 
@@ -18669,9 +18678,9 @@ static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) {
 
 
 static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
-#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated ((EditingToolsAdjustToolAdjustToolCommand*) self);
-#line 18675 "EditingTools.c"
+#line 18684 "EditingTools.c"
 }
 
 
@@ -18681,55 +18690,55 @@ static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust
 	const gchar* _tmp1_ = NULL;
 	EditingToolsAdjustTool* _tmp2_ = NULL;
 	EditingToolsAdjustTool* _tmp3_ = NULL;
-#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (explanation != NULL, NULL);
-#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = name;
-#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = explanation;
-#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustToolCommand*) command_construct (object_type, _tmp0_, _tmp1_);
-#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = owner;
-#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->owner = _tmp2_;
-#line 2338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = owner;
-#line 2338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "deactivated", (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self, 0);
-#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18707 "EditingTools.c"
+#line 18716 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self) {
 	CommandManager* _tmp0_ = NULL;
 	CommandManager* _tmp1_ = NULL;
-#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_ADJUST_TOOL_IS_ADJUST_TOOL_COMMAND (self));
-#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_reset (_tmp1_);
-#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 18724 "EditingTools.c"
+#line 18733 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_command_class_init (EditingToolsAdjustToolAdjustToolCommandClass * klass) {
-#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_command_parent_class = g_type_class_peek_parent (klass);
-#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_command_finalize;
-#line 18733 "EditingTools.c"
+#line 18742 "EditingTools.c"
 }
 
 
@@ -18740,26 +18749,26 @@ static void editing_tools_adjust_tool_adjust_tool_command_instance_init (Editing
 static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject* obj) {
 	EditingToolsAdjustToolAdjustToolCommand * self;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
-#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand);
-#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->owner;
-#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 18750 "EditingTools.c"
+#line 18759 "EditingTools.c"
 		EditingToolsAdjustTool* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
-#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->owner;
-#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp2_, NULL, FALSE);
-#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self);
-#line 18759 "EditingTools.c"
+#line 18768 "EditingTools.c"
 	}
-#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_command_parent_class)->finalize (obj);
-#line 18763 "EditingTools.c"
+#line 18772 "EditingTools.c"
 }
 
 
@@ -18784,46 +18793,46 @@ static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjus
 	PixelTransformationBundle* _tmp4_ = NULL;
 	PixelTransformationBundle* _tmp5_ = NULL;
 	PixelTransformationBundle* _tmp6_ = NULL;
-#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (current), NULL);
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _ ("Reset Colors");
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _ ("Reset all color adjustments to original");
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_);
-#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = current;
-#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = pixel_transformation_bundle_copy (_tmp3_);
-#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->original = _tmp4_;
-#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = pixel_transformation_bundle_new ();
-#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
-#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->reset = _tmp5_;
-#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->reset;
-#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformation_bundle_set_to_identity (_tmp6_);
-#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18820 "EditingTools.c"
+#line 18829 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, PixelTransformationBundle* current) {
-#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_reset_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, owner, current);
-#line 18827 "EditingTools.c"
+#line 18836 "EditingTools.c"
 }
 
 
@@ -18831,15 +18840,15 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command
 	EditingToolsAdjustToolAdjustResetCommand * self;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
 	PixelTransformationBundle* _tmp1_ = NULL;
-#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->reset;
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18843 "EditingTools.c"
+#line 18852 "EditingTools.c"
 }
 
 
@@ -18847,15 +18856,15 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* b
 	EditingToolsAdjustToolAdjustResetCommand * self;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
 	PixelTransformationBundle* _tmp1_ = NULL;
-#line 2369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->original;
-#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18859 "EditingTools.c"
+#line 18868 "EditingTools.c"
 }
 
 
@@ -18869,89 +18878,89 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
 	EditingToolsAdjustToolAdjustResetCommand* _tmp3_ = NULL;
 	EditingToolsAdjustTool* _tmp4_ = NULL;
 	EditingToolsAdjustTool* _tmp5_ = NULL;
-#line 2373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = command;
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND) ? ((EditingToolsAdjustToolAdjustResetCommand*) _tmp0_) : NULL);
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	reset_command = _tmp1_;
-#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = reset_command;
-#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == NULL) {
-#line 2376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (reset_command);
-#line 2376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18893 "EditingTools.c"
+#line 18902 "EditingTools.c"
 	}
-#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = reset_command;
-#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (reset_command);
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18909 "EditingTools.c"
+#line 18918 "EditingTools.c"
 	}
-#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (reset_command);
-#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18917 "EditingTools.c"
+#line 18926 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_class_init (EditingToolsAdjustToolAdjustResetCommandClass * klass) {
-#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_reset_command_parent_class = g_type_class_peek_parent (klass);
-#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustResetCommandPrivate));
-#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->execute = editing_tools_adjust_tool_adjust_reset_command_real_execute;
-#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->undo = editing_tools_adjust_tool_adjust_reset_command_real_undo;
-#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->compress = editing_tools_adjust_tool_adjust_reset_command_real_compress;
-#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#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 18934 "EditingTools.c"
+#line 18943 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_instance_init (EditingToolsAdjustToolAdjustResetCommand * self) {
-#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE (self);
-#line 18941 "EditingTools.c"
+#line 18950 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject* obj) {
 	EditingToolsAdjustToolAdjustResetCommand * self;
-#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
-#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_reset_command_parent_class)->finalize (obj);
-#line 18955 "EditingTools.c"
+#line 18964 "EditingTools.c"
 }
 
 
@@ -18981,62 +18990,62 @@ static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_
 	PixelTransformation* _tmp9_ = NULL;
 	PixelTransformationType _tmp10_ = 0;
 	PixelTransformationType _tmp11_ = 0;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (old_transformation), NULL);
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation), NULL);
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
-#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = name;
-#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = name;
-#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolSliderAdjustmentCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_);
-#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = old_transformation;
-#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _pixel_transformation_ref0 (_tmp3_);
-#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->old_transformation);
-#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->old_transformation = _tmp4_;
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = new_transformation;
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _pixel_transformation_ref0 (_tmp5_);
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->new_transformation = _tmp6_;
-#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = old_transformation;
-#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
-#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformation_type = _tmp8_;
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = new_transformation;
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = pixel_transformation_get_transformation_type (_tmp9_);
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->transformation_type;
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp10_ == _tmp11_, "new_transformation.get_transformation_type() == transformation_type");
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 19033 "EditingTools.c"
+#line 19042 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) {
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_slider_adjustment_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, owner, old_transformation, new_transformation, name);
-#line 19040 "EditingTools.c"
+#line 19049 "EditingTools.c"
 }
 
 
@@ -19046,21 +19055,21 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Co
 	PixelTransformation* _tmp1_ = NULL;
 	EditingToolsAdjustTool* _tmp2_ = NULL;
 	EditingToolsPhotoCanvas* _tmp3_ = NULL;
-#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->new_transformation;
-#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 19064 "EditingTools.c"
+#line 19073 "EditingTools.c"
 }
 
 
@@ -19074,35 +19083,35 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Comma
 	EditingToolsAdjustTool* _tmp5_ = NULL;
 	EditingToolsAdjustTool* _tmp6_ = NULL;
 	EditingToolsPhotoCanvas* _tmp7_ = NULL;
-#line 2407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->old_transformation;
-#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_unbind_window_handlers (_tmp2_);
-#line 2411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->old_transformation;
-#line 2411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_slider (_tmp3_, _tmp4_);
-#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (_tmp5_);
-#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 19106 "EditingTools.c"
+#line 19115 "EditingTools.c"
 }
 
 
@@ -19116,35 +19125,35 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Comma
 	EditingToolsAdjustTool* _tmp5_ = NULL;
 	EditingToolsAdjustTool* _tmp6_ = NULL;
 	EditingToolsPhotoCanvas* _tmp7_ = NULL;
-#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->new_transformation;
-#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_unbind_window_handlers (_tmp2_);
-#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->new_transformation;
-#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_slider (_tmp3_, _tmp4_);
-#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (_tmp5_);
-#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 19148 "EditingTools.c"
+#line 19157 "EditingTools.c"
 }
 
 
@@ -19165,121 +19174,121 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp10_ = NULL;
 	PixelTransformation* _tmp11_ = NULL;
 	PixelTransformation* _tmp12_ = NULL;
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = command;
-#line 2428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND) ? ((EditingToolsAdjustToolSliderAdjustmentCommand*) _tmp0_) : NULL);
-#line 2428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	slider_adjustment = _tmp1_;
-#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = slider_adjustment;
-#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == NULL) {
-#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
-#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19189 "EditingTools.c"
+#line 19198 "EditingTools.c"
 	}
-#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = slider_adjustment;
-#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
-#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19205 "EditingTools.c"
+#line 19214 "EditingTools.c"
 	}
-#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = slider_adjustment;
-#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->priv->transformation_type;
-#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->transformation_type;
-#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp7_ != _tmp8_) {
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19221 "EditingTools.c"
+#line 19230 "EditingTools.c"
 	}
-#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = slider_adjustment;
-#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = slider_adjustment;
-#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_->priv->new_transformation;
-#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _pixel_transformation_ref0 (_tmp11_);
-#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->new_transformation = _tmp12_;
-#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (slider_adjustment);
-#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 19243 "EditingTools.c"
+#line 19252 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_class_init (EditingToolsAdjustToolSliderAdjustmentCommandClass * klass) {
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_adjustment_command_parent_class = g_type_class_peek_parent (klass);
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolSliderAdjustmentCommandPrivate));
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->execute = editing_tools_adjust_tool_slider_adjustment_command_real_execute;
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->undo = editing_tools_adjust_tool_slider_adjustment_command_real_undo;
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->redo = editing_tools_adjust_tool_slider_adjustment_command_real_redo;
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->compress = editing_tools_adjust_tool_slider_adjustment_command_real_compress;
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#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 19262 "EditingTools.c"
+#line 19271 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_instance_init (EditingToolsAdjustToolSliderAdjustmentCommand * self) {
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE (self);
-#line 19269 "EditingTools.c"
+#line 19278 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject* obj) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->old_transformation);
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_slider_adjustment_command_parent_class)->finalize (obj);
-#line 19283 "EditingTools.c"
+#line 19292 "EditingTools.c"
 }
 
 
@@ -19302,40 +19311,40 @@ static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adj
 	Photo* _tmp2_ = NULL;
 	Photo* _tmp3_ = NULL;
 	PixelTransformationBundle* _tmp4_ = NULL;
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
-#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustEnhanceCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = photo;
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->photo = _tmp2_;
-#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = photo;
-#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = photo_get_color_adjustments (_tmp3_);
-#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->original = _tmp4_;
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 19332 "EditingTools.c"
+#line 19341 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, Photo* photo) {
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_enhance_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, owner, photo);
-#line 19339 "EditingTools.c"
+#line 19348 "EditingTools.c"
 }
 
 
@@ -19344,32 +19353,32 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma
 	PixelTransformationBundle* _tmp0_ = NULL;
 	EditingToolsAdjustTool* _tmp3_ = NULL;
 	PixelTransformationBundle* _tmp4_ = NULL;
-#line 2462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->enhanced;
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 19354 "EditingTools.c"
+#line 19363 "EditingTools.c"
 		Photo* _tmp1_ = NULL;
 		PixelTransformationBundle* _tmp2_ = NULL;
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->priv->photo;
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = photo_get_enhance_transformations (_tmp1_);
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_pixel_transformation_bundle_unref0 (self->priv->enhanced);
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->enhanced = _tmp2_;
-#line 19365 "EditingTools.c"
+#line 19374 "EditingTools.c"
 	}
-#line 2466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->enhanced;
-#line 2466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp3_, _tmp4_);
-#line 19373 "EditingTools.c"
+#line 19382 "EditingTools.c"
 }
 
 
@@ -19377,15 +19386,15 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command*
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
 	PixelTransformationBundle* _tmp1_ = NULL;
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->original;
-#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 19389 "EditingTools.c"
+#line 19398 "EditingTools.c"
 }
 
 
@@ -19403,21 +19412,21 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp15_ = NULL;
 	EditingToolsAdjustTool* _tmp16_ = NULL;
 	EditingToolsAdjustTool* _tmp17_ = NULL;
-#line 2473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = command;
-#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_ENHANCE_SINGLE_COMMAND) ? ((EnhanceSingleCommand*) _tmp0_) : NULL);
-#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	enhance_single = _tmp1_;
-#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = enhance_single;
-#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ != NULL) {
-#line 19421 "EditingTools.c"
+#line 19430 "EditingTools.c"
 		Photo* photo = NULL;
 		EnhanceSingleCommand* _tmp3_ = NULL;
 		DataSource* _tmp4_ = NULL;
@@ -19428,127 +19437,127 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 		Photo* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
 		gboolean _tmp11_ = FALSE;
-#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = enhance_single;
-#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = single_data_source_command_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand));
-#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo);
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = photo;
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_);
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_;
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource));
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _tmp10_;
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = _tmp11_;
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (photo);
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_single);
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19462 "EditingTools.c"
+#line 19471 "EditingTools.c"
 	}
-#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = command;
-#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND) ? ((EditingToolsAdjustToolAdjustEnhanceCommand*) _tmp12_) : NULL);
-#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	enhance_command = _tmp13_;
-#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = enhance_command;
-#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp14_ == NULL) {
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_command);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_single);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19482 "EditingTools.c"
+#line 19491 "EditingTools.c"
 	}
-#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = enhance_command;
-#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp16_ != _tmp17_) {
-#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_command);
-#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_single);
-#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19500 "EditingTools.c"
+#line 19509 "EditingTools.c"
 	}
-#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (enhance_command);
-#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (enhance_single);
-#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 19510 "EditingTools.c"
+#line 19519 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_class_init (EditingToolsAdjustToolAdjustEnhanceCommandClass * klass) {
-#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_enhance_command_parent_class = g_type_class_peek_parent (klass);
-#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustEnhanceCommandPrivate));
-#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->execute = editing_tools_adjust_tool_adjust_enhance_command_real_execute;
-#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->undo = editing_tools_adjust_tool_adjust_enhance_command_real_undo;
-#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->compress = editing_tools_adjust_tool_adjust_enhance_command_real_compress;
-#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#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 19527 "EditingTools.c"
+#line 19536 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_instance_init (EditingToolsAdjustToolAdjustEnhanceCommand * self) {
-#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE (self);
-#line 2453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->enhanced = NULL;
-#line 19536 "EditingTools.c"
+#line 19545 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject* obj) {
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
-#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
-#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->enhanced);
-#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_enhance_command_parent_class)->finalize (obj);
-#line 19552 "EditingTools.c"
+#line 19561 "EditingTools.c"
 }
 
 
@@ -19565,110 +19574,110 @@ static GType editing_tools_adjust_tool_adjust_enhance_command_get_type (void) {
 
 
 static void editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass * klass) {
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_parent_class = g_type_class_peek_parent (klass);
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_adjust_tool_finalize;
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolPrivate));
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->activate = editing_tools_adjust_tool_real_activate;
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_adjust_tool_real_get_tool_window;
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->deactivate = editing_tools_adjust_tool_real_deactivate;
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = editing_tools_adjust_tool_real_paint;
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = editing_tools_adjust_tool_real_get_display_pixbuf;
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_adjust_tool_real_on_keypress;
-#line 19587 "EditingTools.c"
+#line 19596 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * self) {
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_GET_PRIVATE (self);
-#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->adjust_tool_window = NULL;
-#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->suppress_effect_redraw = FALSE;
-#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = NULL;
-#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->histogram_pixbuf = NULL;
-#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->virgin_histogram_pixbuf = NULL;
-#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformer = NULL;
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->histogram_transformer = NULL;
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformations = NULL;
-#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = NULL;
-#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache_length1 = 0;
-#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->disable_histogram_refresh = FALSE;
-#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->temperature_scheduler = NULL;
-#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->tint_scheduler = NULL;
-#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->contrast_scheduler = NULL;
-#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->saturation_scheduler = NULL;
-#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->exposure_scheduler = NULL;
-#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->shadows_scheduler = NULL;
-#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->highlights_scheduler = NULL;
-#line 19632 "EditingTools.c"
+#line 19641 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool* obj) {
 	EditingToolsAdjustTool * self;
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->virgin_histogram_pixbuf);
-#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->transformer);
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->histogram_transformer);
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
-#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->temperature_scheduler);
-#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->tint_scheduler);
-#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->contrast_scheduler);
-#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->saturation_scheduler);
-#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->exposure_scheduler);
-#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->shadows_scheduler);
-#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->finalize (obj);
-#line 19672 "EditingTools.c"
+#line 19681 "EditingTools.c"
 }
 
 
diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala
index e0cf727..c3c79f6 100644
--- a/src/editing_tools/EditingTools.vala
+++ b/src/editing_tools/EditingTools.vala
@@ -52,6 +52,7 @@ public abstract class EditingToolWindow : Gtk.Window {
 
         // Needed to prevent the (spurious) 'This event was synthesised outside of GDK'
         // warnings after a keypress.
+        // TODO: Check if really still necessary
         Log.set_handler("Gdk", LogLevelFlags.LEVEL_WARNING, suppress_warnings);
     }
 
@@ -90,6 +91,10 @@ public abstract class EditingToolWindow : Gtk.Window {
         
         base.realize();
     }
+
+    private void suppress_warnings(string? log_domain, LogLevelFlags log_levels, string message) {
+        // do nothing.
+    }
 }
 
 // The PhotoCanvas is an interface object between an EditingTool and its host.  It provides objects
diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c
index d795f0c..cd0a017 100644
--- a/src/editing_tools/StraightenTool.c
+++ b/src/editing_tools/StraightenTool.c
@@ -1,4 +1,4 @@
-/* StraightenTool.c generated by valac 0.34.2, the Vala compiler
+/* StraightenTool.c generated by valac 0.32.1, the Vala compiler
  * generated from StraightenTool.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/Branch.c b/src/events/Branch.c
index dba14ee..193a8ee 100644
--- a/src/events/Branch.c
+++ b/src/events/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.2, the Vala compiler
+/* Branch.c generated by valac 0.32.1, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2140,13 +2140,13 @@ static void events_branch_on_no_event_collection_altered (EventsBranch* self) {
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return;
 #line 2152 "Branch.c"
 }
@@ -2173,35 +2173,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 2207 "Branch.c"
 }
diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c
index 4ee60a9..f63d633 100644
--- a/src/events/EventDirectoryItem.c
+++ b/src/events/EventDirectoryItem.c
@@ -1,4 +1,4 @@
-/* EventDirectoryItem.c generated by valac 0.34.2, the Vala compiler
+/* EventDirectoryItem.c generated by valac 0.32.1, the Vala compiler
  * generated from EventDirectoryItem.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/EventPage.c b/src/events/EventPage.c
index e5a8d6a..04ee3ff 100644
--- a/src/events/EventPage.c
+++ b/src/events/EventPage.c
@@ -1,4 +1,4 @@
-/* EventPage.c generated by valac 0.34.2, the Vala compiler
+/* EventPage.c generated by valac 0.32.1, the Vala compiler
  * generated from EventPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/Events.c b/src/events/Events.c
index d1d1ee2..d99ab32 100644
--- a/src/events/Events.c
+++ b/src/events/Events.c
@@ -1,4 +1,4 @@
-/* Events.c generated by valac 0.34.2, the Vala compiler
+/* Events.c generated by valac 0.32.1, 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 ca566b4..bf6b264 100644
--- a/src/events/EventsDirectoryPage.c
+++ b/src/events/EventsDirectoryPage.c
@@ -1,4 +1,4 @@
-/* EventsDirectoryPage.c generated by valac 0.34.2, the Vala compiler
+/* EventsDirectoryPage.c generated by valac 0.32.1, the Vala compiler
  * generated from EventsDirectoryPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1000,7 +1000,7 @@ static void events_directory_page_real_add_actions (Page* base);
 void page_add_actions (Page* self);
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
-static GVariant* _variant_new10 (gboolean value);
+static GVariant* _variant_new14 (gboolean value);
 static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count);
 void page_init_actions (Page* self, gint selected_count, gint count);
 static void events_directory_page_real_update_actions (Page* base, gint selected_count, gint count);
@@ -1500,8 +1500,8 @@ static Comparator events_directory_page_get_event_comparator (gboolean ascending
 }
 
 
-static GVariant* _variant_new10 (gboolean value) {
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+static GVariant* _variant_new14 (gboolean value) {
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 1507 "EventsDirectoryPage.c"
 }
@@ -1511,12 +1511,13 @@ static void events_directory_page_real_add_actions (Page* base) {
 	EventsDirectoryPage * self;
 	AppWindow* _tmp0_ = NULL;
 	AppWindow* _tmp1_ = NULL;
-	GAction* _tmp2_ = NULL;
-	GSimpleAction* _tmp3_ = NULL;
-	GSimpleAction* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	ConfigFacade* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	gboolean display_comments = FALSE;
+	ConfigFacade* _tmp2_ = NULL;
+	ConfigFacade* _tmp3_ = NULL;
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp5_ = FALSE;
+	GAction* _tmp6_ = NULL;
+	GAction* _tmp7_ = NULL;
 	GVariant* _tmp8_ = NULL;
 #line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
@@ -1531,34 +1532,30 @@ static void events_directory_page_real_add_actions (Page* base) {
 #line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp1_);
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment");
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	if (_tmp3_ == NULL) {
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-		_g_object_unref0 (_tmp2_);
-#line 1542 "EventsDirectoryPage.c"
-	}
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp4_ = _tmp3_;
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_ = config_facade_get_instance ();
+	_tmp2_ = config_facade_get_instance ();
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp7_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp4_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp8_ = _variant_new10 (_tmp7_);
+	_tmp5_ = _tmp4_;
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	g_simple_action_set_state (_tmp4_, _tmp8_);
+	_g_object_unref0 (_tmp3_);
 #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	display_comments = _tmp5_;
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp6_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment");
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp7_ = _tmp6_;
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp8_ = _variant_new14 (display_comments);
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	g_action_change_state (_tmp7_, _tmp8_);
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_variant_unref0 (_tmp8_);
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_g_object_unref0 (_tmp6_);
-#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_g_object_unref0 (_tmp4_);
-#line 1562 "EventsDirectoryPage.c"
+#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_g_object_unref0 (_tmp7_);
+#line 1559 "EventsDirectoryPage.c"
 }
 
 
@@ -1585,7 +1582,7 @@ static void events_directory_page_real_init_actions (Page* base, gint selected_c
 	if (_tmp3_ == NULL) {
 #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1589 "EventsDirectoryPage.c"
+#line 1586 "EventsDirectoryPage.c"
 	}
 #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	action = _tmp3_;
@@ -1595,7 +1592,7 @@ static void events_directory_page_real_init_actions (Page* base, gint selected_c
 	g_signal_connect_object (action, "change-state", (GCallback) _events_directory_page_on_sort_changed_g_simple_action_change_state, self, 0);
 #line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (action);
-#line 1599 "EventsDirectoryPage.c"
+#line 1596 "EventsDirectoryPage.c"
 }
 
 
@@ -1628,7 +1625,7 @@ static void events_directory_page_real_update_actions (Page* base, gint selected
 	_tmp4_ = count;
 #line 139 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	PAGE_CLASS (events_directory_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp3_, _tmp4_);
-#line 1632 "EventsDirectoryPage.c"
+#line 1629 "EventsDirectoryPage.c"
 }
 
 
@@ -1647,7 +1644,7 @@ static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPag
 	result = _tmp1_;
 #line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1651 "EventsDirectoryPage.c"
+#line 1648 "EventsDirectoryPage.c"
 }
 
 
@@ -1666,14 +1663,14 @@ static gchar* events_directory_page_real_get_filter_no_match_message (Checkerboa
 	result = _tmp1_;
 #line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1670 "EventsDirectoryPage.c"
+#line 1667 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1677 "EventsDirectoryPage.c"
+#line 1674 "EventsDirectoryPage.c"
 }
 
 
@@ -1709,7 +1706,7 @@ static void events_directory_page_real_on_item_activated (CheckerboardPage* base
 	_g_object_unref0 (_tmp3_);
 #line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (event);
-#line 1713 "EventsDirectoryPage.c"
+#line 1710 "EventsDirectoryPage.c"
 }
 
 
@@ -1764,7 +1761,7 @@ static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GS
 	_tmp9_ = value;
 #line 161 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 1768 "EventsDirectoryPage.c"
+#line 1765 "EventsDirectoryPage.c"
 }
 
 
@@ -1813,7 +1810,7 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 	if (_tmp3_) {
 #line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1817 "EventsDirectoryPage.c"
+#line 1814 "EventsDirectoryPage.c"
 	}
 #line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -1861,7 +1858,7 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 		_g_object_unref0 (item);
 #line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1865 "EventsDirectoryPage.c"
+#line 1862 "EventsDirectoryPage.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
@@ -1891,7 +1888,7 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 	_text_entry_dialog_mediator_unref0 (rename_dialog);
 #line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 1895 "EventsDirectoryPage.c"
+#line 1892 "EventsDirectoryPage.c"
 }
 
 
@@ -1940,7 +1937,7 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 	if (_tmp3_) {
 #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1944 "EventsDirectoryPage.c"
+#line 1941 "EventsDirectoryPage.c"
 	}
 #line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -1988,7 +1985,7 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 		_g_object_unref0 (item);
 #line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1992 "EventsDirectoryPage.c"
+#line 1989 "EventsDirectoryPage.c"
 	}
 #line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
@@ -2018,7 +2015,7 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 2022 "EventsDirectoryPage.c"
+#line 2019 "EventsDirectoryPage.c"
 }
 
 
@@ -2053,7 +2050,7 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
 	if (_tmp3_) {
 #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2057 "EventsDirectoryPage.c"
+#line 2054 "EventsDirectoryPage.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -2085,7 +2082,7 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
 	_command_manager_unref0 (_tmp11_);
 #line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (command);
-#line 2089 "EventsDirectoryPage.c"
+#line 2086 "EventsDirectoryPage.c"
 }
 
 
@@ -2123,14 +2120,14 @@ static void events_directory_page_on_display_comments (EventsDirectoryPage* self
 	_tmp5_ = value;
 #line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 2127 "EventsDirectoryPage.c"
+#line 2124 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 2134 "EventsDirectoryPage.c"
+#line 2131 "EventsDirectoryPage.c"
 }
 
 
@@ -2149,7 +2146,7 @@ static SearchViewFilter* events_directory_page_real_get_search_view_filter (Chec
 	result = _tmp1_;
 #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2153 "EventsDirectoryPage.c"
+#line 2150 "EventsDirectoryPage.c"
 }
 
 
@@ -2170,7 +2167,7 @@ static DataView* events_directory_page_event_directory_manager_real_create_view
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2174 "EventsDirectoryPage.c"
+#line 2171 "EventsDirectoryPage.c"
 }
 
 
@@ -2180,14 +2177,14 @@ EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_
 	self = (EventsDirectoryPageEventDirectoryManager*) view_manager_construct (object_type);
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2184 "EventsDirectoryPage.c"
+#line 2181 "EventsDirectoryPage.c"
 }
 
 
 EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_new (void) {
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return events_directory_page_event_directory_manager_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER);
-#line 2191 "EventsDirectoryPage.c"
+#line 2188 "EventsDirectoryPage.c"
 }
 
 
@@ -2196,7 +2193,7 @@ static void events_directory_page_event_directory_manager_class_init (EventsDire
 	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;
-#line 2200 "EventsDirectoryPage.c"
+#line 2197 "EventsDirectoryPage.c"
 }
 
 
@@ -2225,7 +2222,7 @@ static guint events_directory_page_events_directory_search_view_filter_real_get_
 	result = (guint) SEARCH_FILTER_CRITERIA_TEXT;
 #line 16 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2229 "EventsDirectoryPage.c"
+#line 2226 "EventsDirectoryPage.c"
 }
 
 
@@ -2233,19 +2230,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 2249 "EventsDirectoryPage.c"
+#line 2246 "EventsDirectoryPage.c"
 }
 
 
@@ -2291,7 +2288,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 		result = TRUE;
 #line 22 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2295 "EventsDirectoryPage.c"
+#line 2292 "EventsDirectoryPage.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = view;
@@ -2317,11 +2314,11 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 		_g_object_unref0 (source);
 #line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2321 "EventsDirectoryPage.c"
+#line 2318 "EventsDirectoryPage.c"
 	}
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp12_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp11_);
-#line 2325 "EventsDirectoryPage.c"
+#line 2322 "EventsDirectoryPage.c"
 	{
 		gchar** word_collection = NULL;
 		gint word_collection_length1 = 0;
@@ -2333,11 +2330,11 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 		word_collection_length1 = _tmp11_;
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		for (word_it = 0; word_it < _tmp11_; word_it = word_it + 1) {
-#line 2337 "EventsDirectoryPage.c"
+#line 2334 "EventsDirectoryPage.c"
 			const gchar* word = NULL;
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			word = word_collection[word_it];
-#line 2341 "EventsDirectoryPage.c"
+#line 2338 "EventsDirectoryPage.c"
 			{
 				const gchar* _tmp13_ = NULL;
 				const gchar* _tmp14_ = NULL;
@@ -2356,7 +2353,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 					_g_object_unref0 (source);
 #line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 					return result;
-#line 2360 "EventsDirectoryPage.c"
+#line 2357 "EventsDirectoryPage.c"
 				}
 			}
 		}
@@ -2367,7 +2364,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 	_g_object_unref0 (source);
 #line 35 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2371 "EventsDirectoryPage.c"
+#line 2368 "EventsDirectoryPage.c"
 }
 
 
@@ -2377,14 +2374,14 @@ static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page
 	self = (EventsDirectoryPageEventsDirectorySearchViewFilter*) search_view_filter_construct (object_type);
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2381 "EventsDirectoryPage.c"
+#line 2378 "EventsDirectoryPage.c"
 }
 
 
 static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_new (void) {
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return events_directory_page_events_directory_search_view_filter_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER);
-#line 2388 "EventsDirectoryPage.c"
+#line 2385 "EventsDirectoryPage.c"
 }
 
 
@@ -2395,7 +2392,7 @@ static void events_directory_page_events_directory_search_view_filter_class_init
 	((SearchViewFilterClass *) klass)->get_criteria = 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;
-#line 2399 "EventsDirectoryPage.c"
+#line 2396 "EventsDirectoryPage.c"
 }
 
 
@@ -2438,7 +2435,7 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass)
 	((CheckerboardPageClass *) klass)->get_search_view_filter = 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 2442 "EventsDirectoryPage.c"
+#line 2439 "EventsDirectoryPage.c"
 }
 
 
@@ -2450,7 +2447,7 @@ static void events_directory_page_instance_init (EventsDirectoryPage * self) {
 	_tmp0_ = events_directory_page_events_directory_search_view_filter_new ();
 #line 43 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 2454 "EventsDirectoryPage.c"
+#line 2451 "EventsDirectoryPage.c"
 }
 
 
@@ -2472,7 +2469,7 @@ static void events_directory_page_finalize (GObject* obj) {
 	if (_tmp1_ == NULL) {
 #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2476 "EventsDirectoryPage.c"
+#line 2473 "EventsDirectoryPage.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	action = _tmp1_;
@@ -2494,7 +2491,7 @@ static void events_directory_page_finalize (GObject* obj) {
 	_view_filter_unref0 (self->priv->search_filter);
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	G_OBJECT_CLASS (events_directory_page_parent_class)->finalize (obj);
-#line 2498 "EventsDirectoryPage.c"
+#line 2495 "EventsDirectoryPage.c"
 }
 
 
@@ -2535,21 +2532,21 @@ MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_
 	_view_manager_unref0 (_tmp1_);
 #line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2539 "EventsDirectoryPage.c"
+#line 2536 "EventsDirectoryPage.c"
 }
 
 
 MasterEventsDirectoryPage* master_events_directory_page_new (void) {
 #line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return master_events_directory_page_construct (TYPE_MASTER_EVENTS_DIRECTORY_PAGE);
-#line 2546 "EventsDirectoryPage.c"
+#line 2543 "EventsDirectoryPage.c"
 }
 
 
 static void master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) {
 #line 219 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	master_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 2553 "EventsDirectoryPage.c"
+#line 2550 "EventsDirectoryPage.c"
 }
 
 
@@ -2593,37 +2590,37 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 2627 "EventsDirectoryPage.c"
+#line 2624 "EventsDirectoryPage.c"
 }
 
 
@@ -2642,7 +2639,7 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 	_tmp0_ = type;
 #line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) {
-#line 2646 "EventsDirectoryPage.c"
+#line 2643 "EventsDirectoryPage.c"
 		gchar* _tmp1_ = NULL;
 #line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME);
@@ -2650,7 +2647,7 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 		_g_free0 (page_name);
 #line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp1_;
-#line 2654 "EventsDirectoryPage.c"
+#line 2651 "EventsDirectoryPage.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
@@ -2661,11 +2658,11 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 		if (_tmp3_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) {
 #line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT;
-#line 2665 "EventsDirectoryPage.c"
+#line 2662 "EventsDirectoryPage.c"
 		} else {
 #line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT;
-#line 2669 "EventsDirectoryPage.c"
+#line 2666 "EventsDirectoryPage.c"
 		}
 #line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp4_ = g_time_format (time, _tmp2_);
@@ -2673,7 +2670,7 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 		_g_free0 (page_name);
 #line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp4_;
-#line 2677 "EventsDirectoryPage.c"
+#line 2674 "EventsDirectoryPage.c"
 	}
 #line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = page_name;
@@ -2693,14 +2690,14 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 	_g_free0 (page_name);
 #line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2697 "EventsDirectoryPage.c"
+#line 2694 "EventsDirectoryPage.c"
 }
 
 
 SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
 #line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return sub_events_directory_page_construct (TYPE_SUB_EVENTS_DIRECTORY_PAGE, type, time);
-#line 2704 "EventsDirectoryPage.c"
+#line 2701 "EventsDirectoryPage.c"
 }
 
 
@@ -2718,7 +2715,7 @@ gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) {
 	result = _tmp1_;
 #line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2722 "EventsDirectoryPage.c"
+#line 2719 "EventsDirectoryPage.c"
 }
 
 
@@ -2736,7 +2733,7 @@ gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) {
 	result = _tmp1_;
 #line 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2740 "EventsDirectoryPage.c"
+#line 2737 "EventsDirectoryPage.c"
 }
 
 
@@ -2754,7 +2751,7 @@ SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_director
 	result = _tmp1_;
 #line 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2758 "EventsDirectoryPage.c"
+#line 2755 "EventsDirectoryPage.c"
 }
 
 
@@ -2772,7 +2769,7 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
 	_tmp0_ = type;
 #line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2776 "EventsDirectoryPage.c"
+#line 2773 "EventsDirectoryPage.c"
 		struct tm _tmp1_ = {0};
 		gint _tmp2_ = 0;
 #line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2781,7 +2778,7 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
 		_tmp2_ = _tmp1_.tm_mon;
 #line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		self->priv->month = _tmp2_;
-#line 2785 "EventsDirectoryPage.c"
+#line 2782 "EventsDirectoryPage.c"
 	}
 #line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = type;
@@ -2795,29 +2792,29 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
 	self->priv->year = _tmp5_;
 #line 243 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2799 "EventsDirectoryPage.c"
+#line 2796 "EventsDirectoryPage.c"
 }
 
 
 static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
 #line 243 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return sub_events_directory_page_sub_event_directory_manager_construct (SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, type, time);
-#line 2806 "EventsDirectoryPage.c"
+#line 2803 "EventsDirectoryPage.c"
 }
 
 
 static void g_time_local (time_t time, struct tm* result) {
 	struct tm _result_ = {0};
 	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return;
-#line 2821 "EventsDirectoryPage.c"
+#line 2818 "EventsDirectoryPage.c"
 }
 
 
@@ -2850,7 +2847,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 		result = FALSE;
 #line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2854 "EventsDirectoryPage.c"
+#line 2851 "EventsDirectoryPage.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = source;
@@ -2874,13 +2871,13 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 	_tmp9_ = self->priv->year;
 #line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp8_ == _tmp9_) {
-#line 2878 "EventsDirectoryPage.c"
+#line 2875 "EventsDirectoryPage.c"
 		SubEventsDirectoryPageDirectoryType _tmp10_ = 0;
 #line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp10_ = self->priv->type;
 #line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		if (_tmp10_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2884 "EventsDirectoryPage.c"
+#line 2881 "EventsDirectoryPage.c"
 			struct tm _tmp11_ = {0};
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
@@ -2896,7 +2893,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 			_g_object_unref0 (event);
 #line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			return result;
-#line 2900 "EventsDirectoryPage.c"
+#line 2897 "EventsDirectoryPage.c"
 		}
 #line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		result = TRUE;
@@ -2904,7 +2901,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 		_g_object_unref0 (event);
 #line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2908 "EventsDirectoryPage.c"
+#line 2905 "EventsDirectoryPage.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = FALSE;
@@ -2912,7 +2909,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 	_g_object_unref0 (event);
 #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2916 "EventsDirectoryPage.c"
+#line 2913 "EventsDirectoryPage.c"
 }
 
 
@@ -2927,7 +2924,7 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_month (Sub
 	result = _tmp0_;
 #line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2931 "EventsDirectoryPage.c"
+#line 2928 "EventsDirectoryPage.c"
 }
 
 
@@ -2942,7 +2939,7 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubE
 	result = _tmp0_;
 #line 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2946 "EventsDirectoryPage.c"
+#line 2943 "EventsDirectoryPage.c"
 }
 
 
@@ -2957,7 +2954,7 @@ static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_d
 	result = _tmp0_;
 #line 276 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2961 "EventsDirectoryPage.c"
+#line 2958 "EventsDirectoryPage.c"
 }
 
 
@@ -2970,7 +2967,7 @@ static void sub_events_directory_page_sub_event_directory_manager_class_init (Su
 	g_type_class_add_private (klass, sizeof (SubEventsDirectoryPageSubEventDirectoryManagerPrivate));
 #line 238 "/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;
-#line 2974 "EventsDirectoryPage.c"
+#line 2971 "EventsDirectoryPage.c"
 }
 
 
@@ -2981,7 +2978,7 @@ static void sub_events_directory_page_sub_event_directory_manager_instance_init
 	self->priv->month = 0;
 #line 240 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->year = 0;
-#line 2985 "EventsDirectoryPage.c"
+#line 2982 "EventsDirectoryPage.c"
 }
 
 
@@ -2991,7 +2988,7 @@ static void sub_events_directory_page_sub_event_directory_manager_finalize (View
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager);
 #line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->finalize (obj);
-#line 2995 "EventsDirectoryPage.c"
+#line 2992 "EventsDirectoryPage.c"
 }
 
 
@@ -3010,7 +3007,7 @@ static GType sub_events_directory_page_sub_event_directory_manager_get_type (voi
 static void sub_events_directory_page_class_init (SubEventsDirectoryPageClass * klass) {
 #line 227 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	sub_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 3014 "EventsDirectoryPage.c"
+#line 3011 "EventsDirectoryPage.c"
 }
 
 
diff --git a/src/events/EventsDirectoryPage.vala b/src/events/EventsDirectoryPage.vala
index 46fabe3..af20d99 100644
--- a/src/events/EventsDirectoryPage.vala
+++ b/src/events/EventsDirectoryPage.vala
@@ -118,8 +118,8 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
         base.add_actions ();
         AppWindow.get_instance ().add_action_entries (entries, this);
 
-        (get_action ("ViewComment") as GLib.SimpleAction).set_state
-            (Config.Facade.get_instance().get_display_event_comments());
+        var display_comments = Config.Facade.get_instance().get_display_event_comments();
+        get_action ("ViewComment").change_state (display_comments);
     }
 
     protected override void init_actions(int selected_count, int count) {
diff --git a/src/folders/Branch.c b/src/folders/Branch.c
index 6a51126..d44aff9 100644
--- a/src/folders/Branch.c
+++ b/src/folders/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.2, the Vala compiler
+/* Branch.c generated by valac 0.32.1, 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_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, 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"
@@ -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_TYPE_FILE, (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);
 #line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self->priv->entries = _tmp0_;
 #line 1504 "Branch.c"
@@ -1982,7 +1982,7 @@ static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass)
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = folders_sidebar_entry_finalize;
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR, g_param_spec_object ("dir", "dir", "dir", g_file_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR, g_param_spec_object ("dir", "dir", "dir", G_TYPE_FILE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COLLATION, g_param_spec_string ("collation", "collation", "collation", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
diff --git a/src/folders/Folders.c b/src/folders/Folders.c
index e400ed6..d9af95a 100644
--- a/src/folders/Folders.c
+++ b/src/folders/Folders.c
@@ -1,4 +1,4 @@
-/* Folders.c generated by valac 0.34.2, the Vala compiler
+/* Folders.c generated by valac 0.32.1, 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 f7d484f..03bbd48 100644
--- a/src/folders/Page.c
+++ b/src/folders/Page.c
@@ -1,4 +1,4 @@
-/* Page.c generated by valac 0.34.2, the Vala compiler
+/* Page.c generated by valac 0.32.1, the Vala compiler
  * generated from Page.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/Branch.c b/src/library/Branch.c
index 097a951..e7131b0 100644
--- a/src/library/Branch.c
+++ b/src/library/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.2, the Vala compiler
+/* Branch.c generated by valac 0.32.1, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c
index 5cd3d40..16cef0f 100644
--- a/src/library/FlaggedPage.c
+++ b/src/library/FlaggedPage.c
@@ -1,4 +1,4 @@
-/* FlaggedPage.c generated by valac 0.34.2, the Vala compiler
+/* FlaggedPage.c generated by valac 0.32.1, the Vala compiler
  * generated from FlaggedPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/FlaggedSidebarEntry.c b/src/library/FlaggedSidebarEntry.c
index 7bcb9af..7eb90aa 100644
--- a/src/library/FlaggedSidebarEntry.c
+++ b/src/library/FlaggedSidebarEntry.c
@@ -1,4 +1,4 @@
-/* FlaggedSidebarEntry.c generated by valac 0.34.2, the Vala compiler
+/* FlaggedSidebarEntry.c generated by valac 0.32.1, the Vala compiler
  * generated from FlaggedSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c
index 261796a..b46e179 100644
--- a/src/library/ImportQueuePage.c
+++ b/src/library/ImportQueuePage.c
@@ -1,4 +1,4 @@
-/* ImportQueuePage.c generated by valac 0.34.2, the Vala compiler
+/* ImportQueuePage.c generated by valac 0.32.1, the Vala compiler
  * generated from ImportQueuePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c
index e756a2f..8b71718 100644
--- a/src/library/ImportQueueSidebarEntry.c
+++ b/src/library/ImportQueueSidebarEntry.c
@@ -1,4 +1,4 @@
-/* ImportQueueSidebarEntry.c generated by valac 0.34.2, the Vala compiler
+/* ImportQueueSidebarEntry.c generated by valac 0.32.1, the Vala compiler
  * generated from ImportQueueSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c
index 38da28c..fbec432 100644
--- a/src/library/LastImportPage.c
+++ b/src/library/LastImportPage.c
@@ -1,4 +1,4 @@
-/* LastImportPage.c generated by valac 0.34.2, the Vala compiler
+/* LastImportPage.c generated by valac 0.32.1, the Vala compiler
  * generated from LastImportPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/LastImportSidebarEntry.c b/src/library/LastImportSidebarEntry.c
index a1b2eb8..bdf6b91 100644
--- a/src/library/LastImportSidebarEntry.c
+++ b/src/library/LastImportSidebarEntry.c
@@ -1,4 +1,4 @@
-/* LastImportSidebarEntry.c generated by valac 0.34.2, the Vala compiler
+/* LastImportSidebarEntry.c generated by valac 0.32.1, the Vala compiler
  * generated from LastImportSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/Library.c b/src/library/Library.c
index b3f58ca..4ce5d56 100644
--- a/src/library/Library.c
+++ b/src/library/Library.c
@@ -1,4 +1,4 @@
-/* Library.c generated by valac 0.34.2, the Vala compiler
+/* Library.c generated by valac 0.32.1, 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 b300d1c..e4d802b 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -1,4 +1,4 @@
-/* LibraryWindow.c generated by valac 0.34.2, the Vala compiler
+/* LibraryWindow.c generated by valac 0.32.1, the Vala compiler
  * generated from LibraryWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -456,6 +456,27 @@ typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass;
 typedef struct _LibraryPhotosEntry LibraryPhotosEntry;
 typedef struct _LibraryPhotosEntryClass LibraryPhotosEntryClass;
 
+#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
+#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
+#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE))
+#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE))
+#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+
+typedef struct _ConfigurationFacade ConfigurationFacade;
+typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
+
+#define CONFIG_TYPE_FACADE (config_facade_get_type ())
+#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade))
+#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE))
+#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE))
+#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+
+typedef struct _ConfigFacade ConfigFacade;
+typedef struct _ConfigFacadeClass ConfigFacadeClass;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
+
 #define TYPE_VIEW_COLLECTION (view_collection_get_type ())
 #define VIEW_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIEW_COLLECTION, ViewCollection))
 #define VIEW_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIEW_COLLECTION, ViewCollectionClass))
@@ -475,7 +496,6 @@ typedef struct _ViewCollectionClass ViewCollectionClass;
 
 typedef struct _ViewFilter ViewFilter;
 typedef struct _ViewFilterClass ViewFilterClass;
-#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
 
 #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ())
 #define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage))
@@ -557,26 +577,6 @@ typedef struct _SavedSearchClass SavedSearchClass;
 typedef struct _SearchesSidebarEntry SearchesSidebarEntry;
 typedef struct _SearchesSidebarEntryClass SearchesSidebarEntryClass;
 
-#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
-#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
-#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
-#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE))
-#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE))
-#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
-
-typedef struct _ConfigurationFacade ConfigurationFacade;
-typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
-
-#define CONFIG_TYPE_FACADE (config_facade_get_type ())
-#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade))
-#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass))
-#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE))
-#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE))
-#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass))
-
-typedef struct _ConfigFacade ConfigFacade;
-typedef struct _ConfigFacadeClass ConfigFacadeClass;
-
 #define TYPE_MEDIA_PAGE (media_page_get_type ())
 #define MEDIA_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_PAGE, MediaPage))
 #define MEDIA_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_PAGE, MediaPageClass))
@@ -1010,6 +1010,7 @@ struct _LibraryWindowPrivate {
 	GtkStack* stack;
 	GtkBox* layout;
 	GtkBox* right_vbox;
+	GtkRevealer* toolbar_revealer;
 	gint current_progress_priority;
 	guint background_progress_pulse_id;
 };
@@ -1436,6 +1437,15 @@ static void _library_window_on_library_monitor_auto_import_progress_library_moni
 static void library_window_real_add_actions (AppWindow* base);
 void app_window_add_actions (AppWindow* self);
 GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int* result_length1);
+GType configuration_facade_get_type (void) G_GNUC_CONST;
+GType config_facade_get_type (void) G_GNUC_CONST;
+ConfigFacade* config_facade_get_instance (void);
+gboolean configuration_facade_get_display_search_bar (ConfigurationFacade* self);
+static GVariant* _variant_new1 (gboolean value);
+static gboolean library_window_is_sidebar_visible (LibraryWindow* self);
+static GVariant* _variant_new2 (gboolean value);
+static gboolean library_window_is_toolbar_visible (LibraryWindow* self);
+static GVariant* _variant_new3 (gboolean value);
 static void library_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page);
 void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_page);
 GType view_collection_get_type (void) G_GNUC_CONST;
@@ -1455,7 +1465,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 static void library_window_on_view_filter_refreshed (LibraryWindow* self);
 static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self);
 gboolean view_collection_are_items_filtered_out (ViewCollection* self);
-static GVariant* _variant_new1 (gboolean value);
+static GVariant* _variant_new4 (gboolean value);
 static void library_window_real_show_all (GtkWidget* base);
 GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning);
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
@@ -1463,7 +1473,6 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa
 static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show, CheckerboardPage* page);
 static gboolean library_window_should_show_search_bar (LibraryWindow* self);
 static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean visible);
-static gboolean library_window_is_sidebar_visible (LibraryWindow* self);
 LibraryWindow* library_window_get_app (void);
 gboolean library_window_is_mount_uri_supported (const gchar* uri);
 static gchar* library_window_real_get_app_role (AppWindow* base);
@@ -1483,9 +1492,6 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch*
 GType searches_sidebar_entry_get_type (void) G_GNUC_CONST;
 SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search);
 static void library_window_real_on_quit (AppWindow* base);
-GType configuration_facade_get_type (void) G_GNUC_CONST;
-GType config_facade_get_type (void) G_GNUC_CONST;
-ConfigFacade* config_facade_get_instance (void);
 void configuration_facade_set_library_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions);
 void configuration_facade_set_sidebar_position (ConfigurationFacade* self, gint position);
 void app_window_on_quit (AppWindow* self);
@@ -1557,7 +1563,7 @@ void saved_search_dialog_show (SavedSearchDialog* self);
 DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index);
 Event* media_source_get_event (MediaSource* self);
 void library_window_switch_to_event (LibraryWindow* self, Event* event);
-static GVariant* _variant_new2 (gboolean value);
+static GVariant* _variant_new5 (gboolean value);
 void search_filter_toolbar_take_focus (SearchFilterToolbar* self);
 static void library_window_on_clear_search (LibraryWindow* self);
 void search_filter_actions_reset (SearchFilterActions* self);
@@ -1566,20 +1572,20 @@ void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self,
 void preferences_dialog_show (void);
 void properties_update_properties (Properties* self, Page* page);
 void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, gboolean display);
-static gboolean _variant_get3 (GVariant* value);
-static GVariant* _variant_new4 (gboolean value);
+static gboolean _variant_get6 (GVariant* value);
+static GVariant* _variant_new7 (gboolean value);
 void extended_properties_window_update_properties (ExtendedPropertiesWindow* self, Page* page);
 void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gboolean display);
 void library_window_show_search_bar (LibraryWindow* self, gboolean display);
+static GVariant* _variant_new8 (gboolean value);
 void configuration_facade_set_display_sidebar (ConfigurationFacade* self, gboolean display);
 gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self);
 static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean visible);
 GtkToolbar* page_get_toolbar (Page* self);
 void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboolean display);
-static gboolean library_window_is_toolbar_visible (LibraryWindow* self);
 gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self);
 static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show);
-static GVariant* _variant_new5 (gboolean value);
+static GVariant* _variant_new9 (gboolean value);
 void configuration_facade_set_display_extended_properties (ConfigurationFacade* self, gboolean display);
 GType batch_import_get_type (void) G_GNUC_CONST;
 void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel);
@@ -1648,13 +1654,12 @@ GType import_page_get_type (void) G_GNUC_CONST;
 gboolean import_page_unmount_camera (ImportPage* self, GMount* mount);
 static void library_window_remove_from_stack (LibraryWindow* self, Page* page);
 gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade* self);
-static GVariant* _variant_new6 (gboolean value);
+static GVariant* _variant_new10 (gboolean value);
 gboolean configuration_facade_get_display_extended_properties (ConfigurationFacade* self);
-static GVariant* _variant_new7 (gboolean value);
-gboolean configuration_facade_get_display_search_bar (ConfigurationFacade* self);
-static GVariant* _variant_new8 (gboolean value);
+static GVariant* _variant_new11 (gboolean value);
+static GVariant* _variant_new12 (gboolean value);
 gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self);
-static GVariant* _variant_new9 (const gchar* value);
+static GVariant* _variant_new13 (const gchar* value);
 static void library_window_start_pulse_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority);
 static void library_window_stop_pulse_background_progress_bar (LibraryWindow* self, gint priority, gboolean clear);
 static void library_window_show_background_progress_bar (LibraryWindow* self);
@@ -1665,6 +1670,7 @@ static void library_window_update_background_progress_bar (LibraryWindow* self,
 static void library_window_hide_background_progress_bar (LibraryWindow* self);
 gint configuration_facade_get_sidebar_position (ConfigurationFacade* self);
 gint library_window_get_PAGE_MIN_WIDTH (void);
+void application_set_appmenu (GMenuModel* model);
 static void library_window_real_set_current_page (PageWindow* base, Page* page);
 void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable);
 void application_set_menubar (GMenuModel* model);
@@ -1733,89 +1739,89 @@ static gint _vala_array_length (gpointer array);
 
 static const gchar* LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES[3] = {"gphoto2:", "disk:", "file:"};
 const GtkTargetEntry LIBRARY_WINDOW_DND_TARGET_ENTRIES[3] = {{"text/uri-list", (guint) GTK_TARGET_OTHER_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_URI_LIST}, {LIBRARY_WINDOW_MEDIA_LIST_MIME_TYPE, (guint) GTK_TARGET_SAME_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST}, {LIBRARY_WINDOW_TAG_PATH_MIME_TYPE, (guint) GTK_TARGET_SAME_WIDGET, (guint) LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH}};
-static const GActionEntry LIBRARY_WINDOW_common_actions[13] = {{"CommonFileImport", _library_window_on_file_import_gsimple_action_activate_callback}, {"ExternalLibraryImport", _library_window_on_external_library_import_gsimple_action_activate_callback}, {"CommonPreferences", _library_window_on_preferences_gsimple_action_activate_callback}, {"CommonEmptyTrash", _library_window_on_empty_trash_gsimple_action_activate_callback}, {"CommonJumpToEvent", _library_window_on_jump_to_event_gsimple_action_activate_callback}, {"CommonFind", _library_window_on_find_gsimple_action_activate_callback}, {"CommonNewSearch", _library_window_on_new_search_gsimple_action_activate_callback}, {"CommonDisplayBasicProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_basic_properties_gsimple_action_change_state_callback}, {"CommonDisplayExtendedProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_extended_properties_gsimple_action_change_state_callback}, {"CommonDisplaySearchbar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_searchbar_gsimple_action_change_state_callback}, {"CommonDisplaySidebar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_sidebar_gsimple_action_change_state_callback}, {"CommonDisplayToolbar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_toolbar_gsimple_action_change_state_callback}, {"CommonSortEvents", _library_window_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _library_window_on_events_sort_changed_gsimple_action_change_state_callback}};
+static const GActionEntry LIBRARY_WINDOW_common_actions[13] = {{"CommonFileImport", _library_window_on_file_import_gsimple_action_activate_callback}, {"ExternalLibraryImport", _library_window_on_external_library_import_gsimple_action_activate_callback}, {"CommonPreferences", _library_window_on_preferences_gsimple_action_activate_callback}, {"CommonEmptyTrash", _library_window_on_empty_trash_gsimple_action_activate_callback}, {"CommonJumpToEvent", _library_window_on_jump_to_event_gsimple_action_activate_callback}, {"CommonFind", _library_window_on_find_gsimple_action_activate_callback}, {"CommonNewSearch", _library_window_on_new_search_gsimple_action_activate_callback}, {"CommonDisplayBasicProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_basic_properties_gsimple_action_change_state_callback}, {"CommonDisplayExtendedProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_extended_properties_gsimple_action_change_state_callback}, {"CommonDisplaySearchbar", NULL, NULL, "false", _library_window_on_display_searchbar_gsimple_action_change_state_callback}, {"CommonDisplaySidebar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_sidebar_gsimple_action_change_state_callback}, {"CommonDisplayToolbar", NULL, NULL, "true", _library_window_on_display_toolbar_gsimple_action_change_state_callback}, {"CommonSortEvents", _library_window_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _library_window_on_events_sort_changed_gsimple_action_change_state_callback}};
 
 static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) {
-#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_page_created ((LibraryWindow*) self, entry, page);
-#line 1742 "LibraryWindow.c"
+#line 1748 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) {
-#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_destroying_page ((LibraryWindow*) self, entry, page);
-#line 1749 "LibraryWindow.c"
+#line 1755 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self) {
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_entry_selected ((LibraryWindow*) self, selectable);
-#line 1756 "LibraryWindow.c"
+#line 1762 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self) {
-#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_selected_entry_removed ((LibraryWindow*) self, removed);
-#line 1763 "LibraryWindow.c"
+#line 1769 "LibraryWindow.c"
 }
 
 
 static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self) {
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_extended_properties ((LibraryWindow*) self);
-#line 1770 "LibraryWindow.c"
+#line 1776 "LibraryWindow.c"
 }
 
 
 static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self) {
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_extended_properties ((LibraryWindow*) self);
-#line 1777 "LibraryWindow.c"
+#line 1783 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_trashcan_contents_altered ((LibraryWindow*) self);
-#line 1784 "LibraryWindow.c"
+#line 1790 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_media_altered ((LibraryWindow*) self);
-#line 1791 "LibraryWindow.c"
+#line 1797 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self) {
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_metadata_writer_progress ((LibraryWindow*) self, completed, total);
-#line 1798 "LibraryWindow.c"
+#line 1804 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
-#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_installed ((LibraryWindow*) self, monitor);
-#line 1805 "LibraryWindow.c"
+#line 1811 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_destroyed ((LibraryWindow*) self, monitor);
-#line 1812 "LibraryWindow.c"
+#line 1818 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_camera_added ((LibraryWindow*) self, camera);
-#line 1819 "LibraryWindow.c"
+#line 1825 "LibraryWindow.c"
 }
 
 
@@ -1844,121 +1850,121 @@ GType library_window_target_type_get_type (void) {
 
 
 static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_file_import ((LibraryWindow*) self);
-#line 1850 "LibraryWindow.c"
+#line 1856 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_external_library_import ((LibraryWindow*) self);
-#line 1857 "LibraryWindow.c"
+#line 1863 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_preferences ((LibraryWindow*) self);
-#line 1864 "LibraryWindow.c"
+#line 1870 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_empty_trash ((LibraryWindow*) self);
-#line 1871 "LibraryWindow.c"
+#line 1877 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_jump_to_event ((LibraryWindow*) self);
-#line 1878 "LibraryWindow.c"
+#line 1884 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_find ((LibraryWindow*) self);
-#line 1885 "LibraryWindow.c"
+#line 1891 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_new_search ((LibraryWindow*) self);
-#line 1892 "LibraryWindow.c"
+#line 1898 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_action_toggle ((LibraryWindow*) self, action, parameter);
-#line 1899 "LibraryWindow.c"
+#line 1905 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_basic_properties ((LibraryWindow*) self, action, value);
-#line 1906 "LibraryWindow.c"
+#line 1912 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_extended_properties ((LibraryWindow*) self, action, value);
-#line 1913 "LibraryWindow.c"
+#line 1919 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_searchbar ((LibraryWindow*) self, action, value);
-#line 1920 "LibraryWindow.c"
+#line 1926 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_sidebar ((LibraryWindow*) self, action, value);
-#line 1927 "LibraryWindow.c"
+#line 1933 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_toolbar ((LibraryWindow*) self, action, value);
-#line 1934 "LibraryWindow.c"
+#line 1940 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_action_radio ((LibraryWindow*) self, action, parameter);
-#line 1941 "LibraryWindow.c"
+#line 1947 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_events_sort_changed ((LibraryWindow*) self, action, value);
-#line 1948 "LibraryWindow.c"
+#line 1954 "LibraryWindow.c"
 }
 
 
 static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time, gpointer self) {
-#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_external_drop_handler ((LibraryWindow*) self, context, entry, data, info, time);
-#line 1955 "LibraryWindow.c"
+#line 1961 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_now_one_shot_callback (gpointer self) {
-#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties_now ((LibraryWindow*) self);
-#line 1962 "LibraryWindow.c"
+#line 1968 "LibraryWindow.c"
 }
 
 
@@ -2015,117 +2021,117 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 	CameraTable* _tmp56_ = NULL;
 	CameraTable* _tmp57_ = NULL;
 	GtkProgressBar* _tmp58_ = NULL;
-#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = (LibraryWindow*) app_window_construct (object_type);
-#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = sidebar_tree_new (LIBRARY_WINDOW_DND_TARGET_ENTRIES, G_N_ELEMENTS (LIBRARY_WINDOW_DND_TARGET_ENTRIES), GDK_ACTION_ASK, _library_window_external_drop_handler_sidebar_tree_external_drop_handler, self);
-#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->sidebar_tree);
-#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->sidebar_tree = _tmp0_;
-#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->sidebar_tree;
-#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp1_, "page-created", (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self, 0);
 #line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp1_, "page-created", (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self, 0);
+#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp2_, "destroying-page", (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self, 0);
 #line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp2_, "destroying-page", (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self, 0);
+#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->sidebar_tree;
-#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp3_, "entry-selected", (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self, 0);
 #line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp3_, "entry-selected", (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self, 0);
+#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->sidebar_tree;
-#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp4_, "selected-entry-removed", (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self, 0);
-#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->sidebar_tree;
-#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->library_branch;
-#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY);
 #line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY);
+#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = self->priv->sidebar_tree;
-#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->tags_branch;
-#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS);
 #line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS);
+#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->sidebar_tree;
-#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->folders_branch;
-#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS);
 #line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS);
+#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = self->priv->sidebar_tree;
-#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->events_branch;
-#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS);
 #line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS);
+#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->sidebar_tree;
-#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = self->priv->camera_branch;
-#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS);
 #line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS);
+#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->sidebar_tree;
-#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->saved_search_branch;
-#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sidebar_tree_graft (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_SAVED_SEARCH);
-#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = extended_properties_window_new (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp17_);
-#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->extended_properties);
-#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->extended_properties = _tmp17_;
 #line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->extended_properties = _tmp17_;
+#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = self->priv->extended_properties;
-#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "hide", (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self, 0);
 #line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "hide", (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self, 0);
+#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = self->priv->extended_properties;
-#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), "show", (GCallback) _library_window_show_extended_properties_gtk_widget_show, self, 0);
-#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = one_shot_scheduler_new ("LibraryWindow properties", _library_window_on_update_properties_now_one_shot_callback, self);
-#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_one_shot_scheduler_unref0 (self->priv->properties_scheduler);
-#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->properties_scheduler = _tmp20_;
-#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = self->priv->search_actions;
-#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = search_filter_toolbar_new (_tmp21_);
-#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp22_);
-#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->search_toolbar);
-#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->search_toolbar = _tmp22_;
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->library_branch;
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = library_branch_get_photos_entry (_tmp23_);
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = _tmp24_;
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp27_ = _tmp26_;
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_create_layout (self, _tmp27_);
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp27_);
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_load_configuration (self);
-#line 2129 "LibraryWindow.c"
+#line 2135 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp28_ = NULL;
@@ -2134,27 +2140,27 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 		GeeCollection* _tmp31_ = NULL;
 		GeeIterator* _tmp32_ = NULL;
 		GeeIterator* _tmp33_ = NULL;
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = media_collection_registry_get_instance ();
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _tmp28_;
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp30_ = media_collection_registry_get_all (_tmp29_);
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp31_ = _tmp30_;
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp32_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp33_ = _tmp32_;
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp31_);
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_collection_registry_unref0 (_tmp29_);
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_sources_it = _tmp33_;
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
-#line 2158 "LibraryWindow.c"
+#line 2164 "LibraryWindow.c"
 			GeeIterator* _tmp34_ = NULL;
 			gboolean _tmp35_ = FALSE;
 			MediaSourceCollection* media_sources = NULL;
@@ -2162,176 +2168,176 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 			gpointer _tmp37_ = NULL;
 			MediaSourceCollection* _tmp38_ = NULL;
 			MediaSourceCollection* _tmp39_ = NULL;
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp34_ = _media_sources_it;
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp35_ = gee_iterator_next (_tmp34_);
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (!_tmp35_) {
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 2174 "LibraryWindow.c"
+#line 2180 "LibraryWindow.c"
 			}
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp36_ = _media_sources_it;
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp37_ = gee_iterator_get (_tmp36_);
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			media_sources = (MediaSourceCollection*) _tmp37_;
 #line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			media_sources = (MediaSourceCollection*) _tmp37_;
+#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp38_ = media_sources;
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_connect_object (_tmp38_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0);
 #line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			g_signal_connect_object (_tmp38_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0);
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp39_ = media_sources;
-#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0);
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
-#line 2192 "LibraryWindow.c"
+#line 2198 "LibraryWindow.c"
 		}
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 2196 "LibraryWindow.c"
+#line 2202 "LibraryWindow.c"
 	}
-#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST];
-#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST];
-#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = g_new0 (GtkTargetEntry, 2);
-#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_[0] = _tmp40_;
-#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_[1] = _tmp41_;
-#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets = _tmp42_;
-#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets_length1 = 2;
-#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_main_window_dnd_targets_size_ = main_window_dnd_targets_length1;
-#line 196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = main_window_dnd_targets;
-#line 196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43__length1 = main_window_dnd_targets_length1;
-#line 196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp43_, _tmp43__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK);
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = metadata_writer_get_instance ();
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp45_ = _tmp44_;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp45_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0);
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp45_);
-#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp46_ = library_monitor_pool_get_instance ();
-#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp47_ = _tmp46_;
-#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp48_ = library_monitor_pool_get_monitor (_tmp47_);
-#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp49_ = _tmp48_;
-#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp47_);
-#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	monitor = _tmp49_;
 #line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	monitor = _tmp49_;
+#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp50_ = monitor;
-#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp50_ != NULL) {
-#line 2244 "LibraryWindow.c"
+#line 2250 "LibraryWindow.c"
 		LibraryMonitor* _tmp51_ = NULL;
-#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp51_ = monitor;
-#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_library_monitor_installed (self, _tmp51_);
-#line 2250 "LibraryWindow.c"
+#line 2256 "LibraryWindow.c"
 	}
-#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp52_ = library_monitor_pool_get_instance ();
-#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp53_ = _tmp52_;
-#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp53_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0);
-#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp53_);
 #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_library_monitor_pool_unref0 (_tmp53_);
+#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp54_ = library_monitor_pool_get_instance ();
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp55_ = _tmp54_;
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp55_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0);
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp55_);
-#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp56_ = camera_table_get_instance ();
-#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp57_ = _tmp56_;
-#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp57_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0);
-#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_camera_table_unref0 (_tmp57_);
-#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp58_ = self->priv->background_progress_bar;
-#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_show_text (_tmp58_, TRUE);
-#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (monitor);
-#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets = (g_free (main_window_dnd_targets), NULL);
-#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self;
-#line 2286 "LibraryWindow.c"
+#line 2292 "LibraryWindow.c"
 }
 
 
 LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target) {
-#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return library_window_construct (TYPE_LIBRARY_WINDOW, progress_monitor, progress_monitor_target);
-#line 2293 "LibraryWindow.c"
+#line 2299 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self) {
-#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_started ((LibraryWindow*) self);
-#line 2300 "LibraryWindow.c"
+#line 2306 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) {
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
-#line 2307 "LibraryWindow.c"
+#line 2313 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self) {
-#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
-#line 2314 "LibraryWindow.c"
+#line 2320 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender, gint completed_files, gint total_files, gpointer self) {
-#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_update_progress ((LibraryWindow*) self, completed_files, total_files);
-#line 2321 "LibraryWindow.c"
+#line 2327 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self) {
-#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_import_preparing ((LibraryWindow*) self);
-#line 2328 "LibraryWindow.c"
+#line 2334 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) {
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_import_progress ((LibraryWindow*) self, completed_bytes, total_bytes);
-#line 2335 "LibraryWindow.c"
+#line 2341 "LibraryWindow.c"
 }
 
 
@@ -2347,51 +2353,51 @@ static void library_window_on_library_monitor_installed (LibraryWindow* self, Li
 	LibraryMonitor* _tmp8_ = NULL;
 	LibraryMonitor* _tmp9_ = NULL;
 	LibraryMonitor* _tmp10_ = NULL;
-#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
 #line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = monitor;
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:243: on_library_monitor_installed: %s", _tmp4_);
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:244: on_library_monitor_installed: %s", _tmp4_);
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = monitor;
-#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0);
 #line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0);
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = monitor;
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0);
 #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0);
+#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = monitor;
-#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0);
 #line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0);
+#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = monitor;
-#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp8_, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0);
 #line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp8_, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0);
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = monitor;
-#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp9_, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0);
 #line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp9_, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0);
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = monitor;
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp10_, "auto-import-progress", (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self, 0);
-#line 2395 "LibraryWindow.c"
+#line 2401 "LibraryWindow.c"
 }
 
 
@@ -2413,63 +2419,84 @@ static void library_window_on_library_monitor_destroyed (LibraryWindow* self, Li
 	guint _tmp14_ = 0U;
 	LibraryMonitor* _tmp15_ = NULL;
 	guint _tmp16_ = 0U;
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
 #line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = monitor;
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:254: on_library_monitor_destroyed: %s", _tmp4_);
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:255: on_library_monitor_destroyed: %s", _tmp4_);
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = monitor;
-#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE);
-#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self);
 #line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self);
+#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = monitor;
-#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp8_, NULL, FALSE);
-#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self);
 #line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self);
+#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = monitor;
-#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp10_, NULL, FALSE);
-#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self);
 #line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self);
+#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = monitor;
-#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp12_, NULL, FALSE);
-#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self);
 #line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self);
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = monitor;
-#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp14_, NULL, FALSE);
-#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self);
 #line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self);
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = monitor;
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp16_, NULL, FALSE);
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self);
-#line 2473 "LibraryWindow.c"
+#line 2479 "LibraryWindow.c"
+}
+
+
+static GVariant* _variant_new1 (gboolean value) {
+#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 2486 "LibraryWindow.c"
+}
+
+
+static GVariant* _variant_new2 (gboolean value) {
+#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 2493 "LibraryWindow.c"
+}
+
+
+static GVariant* _variant_new3 (gboolean value) {
+#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 2500 "LibraryWindow.c"
 }
 
 
@@ -2479,35 +2506,82 @@ static void library_window_real_add_actions (AppWindow* base) {
 	gint _tmp1_ = 0;
 	GActionEntry* _tmp2_ = NULL;
 	SearchFilterActions* _tmp3_ = NULL;
-#line 290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	GAction* _tmp4_ = NULL;
+	ConfigFacade* _tmp5_ = NULL;
+	ConfigFacade* _tmp6_ = NULL;
+	gboolean _tmp7_ = FALSE;
+	GVariant* _tmp8_ = NULL;
+	GAction* _tmp9_ = NULL;
+	gboolean _tmp10_ = FALSE;
+	GVariant* _tmp11_ = NULL;
+	GAction* _tmp12_ = NULL;
+	gboolean _tmp13_ = FALSE;
+	GVariant* _tmp14_ = NULL;
+#line 286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	APP_WINDOW_CLASS (library_window_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
-#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), LIBRARY_WINDOW_common_actions, G_N_ELEMENTS (LIBRARY_WINDOW_common_actions), self);
-#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_actions;
-#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = search_filter_actions_get_actions (_tmp0_, &_tmp1_);
-#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->search_actions;
-#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), _tmp2_, _tmp1_, _tmp3_);
-#line 2497 "LibraryWindow.c"
+#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp4_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
+#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp5_ = config_facade_get_instance ();
+#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp6_ = _tmp5_;
+#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp7_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp8_ = _variant_new1 (_tmp7_);
+#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_change_state (_tmp4_, _tmp8_);
+#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp8_);
+#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp6_);
+#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp9_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySidebar");
+#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp10_ = library_window_is_sidebar_visible (self);
+#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp11_ = _variant_new2 (_tmp10_);
+#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_change_state (_tmp9_, _tmp11_);
+#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp11_);
+#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp12_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayToolbar");
+#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp13_ = library_window_is_toolbar_visible (self);
+#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp14_ = _variant_new3 (_tmp13_);
+#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_change_state (_tmp12_, _tmp14_);
+#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp14_);
+#line 2571 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
 #line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_installed ((LibraryWindow*) self, filer);
-#line 2504 "LibraryWindow.c"
+#line 2578 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
 #line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_removed ((LibraryWindow*) self, filer);
-#line 2511 "LibraryWindow.c"
+#line 2585 "LibraryWindow.c"
 }
 
 
@@ -2536,7 +2610,7 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 	_tmp2_ = old_page;
 #line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 2540 "LibraryWindow.c"
+#line 2614 "LibraryWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -2569,13 +2643,13 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 		g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self);
 #line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 2573 "LibraryWindow.c"
+#line 2647 "LibraryWindow.c"
 	}
 #line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = new_page;
 #line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_ != NULL) {
-#line 2579 "LibraryWindow.c"
+#line 2653 "LibraryWindow.c"
 		Page* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		ViewCollection* _tmp14_ = NULL;
@@ -2602,7 +2676,7 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 		g_signal_connect_object (_tmp17_, "view-filter-removed", (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self, 0);
 #line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 2606 "LibraryWindow.c"
+#line 2680 "LibraryWindow.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = self->priv->search_actions;
@@ -2612,14 +2686,14 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 	_tmp20_ = new_page;
 #line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_actions_monitor_page_contents (_tmp18_, _tmp19_, _tmp20_);
-#line 2616 "LibraryWindow.c"
+#line 2690 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self) {
 #line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_refreshed ((LibraryWindow*) self);
-#line 2623 "LibraryWindow.c"
+#line 2697 "LibraryWindow.c"
 }
 
 
@@ -2633,7 +2707,7 @@ static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFi
 	_tmp0_ = filter;
 #line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp0_, "refresh", (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self, 0);
-#line 2637 "LibraryWindow.c"
+#line 2711 "LibraryWindow.c"
 }
 
 
@@ -2650,21 +2724,21 @@ static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilt
 	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE);
 #line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self);
-#line 2654 "LibraryWindow.c"
+#line 2728 "LibraryWindow.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2661 "LibraryWindow.c"
+#line 2735 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new1 (gboolean value) {
+static GVariant* _variant_new4 (gboolean value) {
 #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2668 "LibraryWindow.c"
+#line 2742 "LibraryWindow.c"
 }
 
 
@@ -2701,7 +2775,7 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) {
 	if (_tmp5_) {
 #line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 2705 "LibraryWindow.c"
+#line 2779 "LibraryWindow.c"
 	}
 #line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
@@ -2713,22 +2787,22 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) {
 	_tmp8_ = action;
 #line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 2717 "LibraryWindow.c"
+#line 2791 "LibraryWindow.c"
 		GAction* _tmp9_ = NULL;
 		GVariant* _tmp10_ = NULL;
 #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = action;
 #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = _variant_new1 (TRUE);
+		_tmp10_ = _variant_new4 (TRUE);
 #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_action_change_state (_tmp9_, _tmp10_);
 #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_variant_unref0 (_tmp10_);
-#line 2728 "LibraryWindow.c"
+#line 2802 "LibraryWindow.c"
 	}
 #line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 2732 "LibraryWindow.c"
+#line 2806 "LibraryWindow.c"
 }
 
 
@@ -2786,13 +2860,13 @@ static void library_window_real_show_all (GtkWidget* base) {
 	_g_variant_unref0 (_tmp7_);
 #line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
-#line 2790 "LibraryWindow.c"
+#line 2864 "LibraryWindow.c"
 		GtkFrame* _tmp10_ = NULL;
 #line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = self->priv->bottom_frame;
 #line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 2796 "LibraryWindow.c"
+#line 2870 "LibraryWindow.c"
 	}
 #line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
@@ -2802,7 +2876,7 @@ static void library_window_real_show_all (GtkWidget* base) {
 	if (_tmp12_ == NULL) {
 #line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 2806 "LibraryWindow.c"
+#line 2880 "LibraryWindow.c"
 	}
 #line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	current_page = _tmp12_;
@@ -2810,13 +2884,13 @@ static void library_window_real_show_all (GtkWidget* base) {
 	_tmp13_ = current_page;
 #line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_ != NULL) {
-#line 2814 "LibraryWindow.c"
+#line 2888 "LibraryWindow.c"
 		CheckerboardPage* _tmp14_ = NULL;
 #line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = current_page;
 #line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_init_view_filter (self, _tmp14_);
-#line 2820 "LibraryWindow.c"
+#line 2894 "LibraryWindow.c"
 	}
 #line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = library_window_should_show_search_bar (self);
@@ -2832,7 +2906,7 @@ static void library_window_real_show_all (GtkWidget* base) {
 	_g_object_unref0 (current_page);
 #line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_properties_action);
-#line 2836 "LibraryWindow.c"
+#line 2910 "LibraryWindow.c"
 }
 
 
@@ -2853,7 +2927,7 @@ LibraryWindow* library_window_get_app (void) {
 	result = _tmp2_;
 #line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 2857 "LibraryWindow.c"
+#line 2931 "LibraryWindow.c"
 }
 
 
@@ -2861,7 +2935,7 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) {
 	gboolean result = FALSE;
 #line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (uri != NULL, FALSE);
-#line 2865 "LibraryWindow.c"
+#line 2939 "LibraryWindow.c"
 	{
 		const gchar** scheme_collection = NULL;
 		gint scheme_collection_length1 = 0;
@@ -2873,14 +2947,14 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) {
 		scheme_collection_length1 = G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES);
 #line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (scheme_it = 0; scheme_it < G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); scheme_it = scheme_it + 1) {
-#line 2877 "LibraryWindow.c"
+#line 2951 "LibraryWindow.c"
 			gchar* _tmp0_ = NULL;
 			gchar* scheme = NULL;
 #line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp0_ = g_strdup (scheme_collection[scheme_it]);
 #line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			scheme = _tmp0_;
-#line 2884 "LibraryWindow.c"
+#line 2958 "LibraryWindow.c"
 			{
 				const gchar* _tmp1_ = NULL;
 				const gchar* _tmp2_ = NULL;
@@ -2899,11 +2973,11 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) {
 					_g_free0 (scheme);
 #line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					return result;
-#line 2903 "LibraryWindow.c"
+#line 2977 "LibraryWindow.c"
 				}
 #line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (scheme);
-#line 2907 "LibraryWindow.c"
+#line 2981 "LibraryWindow.c"
 			}
 		}
 	}
@@ -2911,7 +2985,7 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) {
 	result = FALSE;
 #line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 2915 "LibraryWindow.c"
+#line 2989 "LibraryWindow.c"
 }
 
 
@@ -2927,7 +3001,7 @@ static gchar* library_window_real_get_app_role (AppWindow* base) {
 	result = _tmp0_;
 #line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 2931 "LibraryWindow.c"
+#line 3005 "LibraryWindow.c"
 }
 
 
@@ -2953,7 +3027,7 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) {
 	_tmp3_ = entry;
 #line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 2957 "LibraryWindow.c"
+#line 3031 "LibraryWindow.c"
 		SidebarTree* _tmp4_ = NULL;
 		TagsSidebarEntry* _tmp5_ = NULL;
 #line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2962,15 +3036,15 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) {
 		_tmp5_ = entry;
 #line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 2966 "LibraryWindow.c"
+#line 3040 "LibraryWindow.c"
 	} else {
 #line 381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_debug ("LibraryWindow.vala:381: No tag entry found for rename");
-#line 2970 "LibraryWindow.c"
+#line 3044 "LibraryWindow.c"
 	}
 #line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 2974 "LibraryWindow.c"
+#line 3048 "LibraryWindow.c"
 }
 
 
@@ -2996,7 +3070,7 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event)
 	_tmp3_ = entry;
 #line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 3000 "LibraryWindow.c"
+#line 3074 "LibraryWindow.c"
 		SidebarTree* _tmp4_ = NULL;
 		EventsEventEntry* _tmp5_ = NULL;
 #line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3005,15 +3079,15 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event)
 		_tmp5_ = entry;
 #line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3009 "LibraryWindow.c"
+#line 3083 "LibraryWindow.c"
 	} else {
 #line 389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_debug ("LibraryWindow.vala:389: No event entry found for rename");
-#line 3013 "LibraryWindow.c"
+#line 3087 "LibraryWindow.c"
 	}
 #line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3017 "LibraryWindow.c"
+#line 3091 "LibraryWindow.c"
 }
 
 
@@ -3039,7 +3113,7 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch*
 	_tmp3_ = entry;
 #line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 3043 "LibraryWindow.c"
+#line 3117 "LibraryWindow.c"
 		SidebarTree* _tmp4_ = NULL;
 		SearchesSidebarEntry* _tmp5_ = NULL;
 #line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3048,15 +3122,15 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch*
 		_tmp5_ = entry;
 #line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3052 "LibraryWindow.c"
+#line 3126 "LibraryWindow.c"
 	} else {
 #line 397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_debug ("LibraryWindow.vala:397: No search entry found for rename");
-#line 3056 "LibraryWindow.c"
+#line 3130 "LibraryWindow.c"
 	}
 #line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3060 "LibraryWindow.c"
+#line 3134 "LibraryWindow.c"
 }
 
 
@@ -3101,7 +3175,7 @@ static void library_window_real_on_quit (AppWindow* base) {
 	_g_object_unref0 (_tmp5_);
 #line 405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	APP_WINDOW_CLASS (library_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
-#line 3105 "LibraryWindow.c"
+#line 3179 "LibraryWindow.c"
 }
 
 
@@ -3134,7 +3208,7 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
 #line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_ > 0) {
-#line 3138 "LibraryWindow.c"
+#line 3212 "LibraryWindow.c"
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
 #line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3145,7 +3219,7 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 		_g_object_unref0 (_tmp2_);
 #line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp6_;
-#line 3149 "LibraryWindow.c"
+#line 3223 "LibraryWindow.c"
 	} else {
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
@@ -3157,7 +3231,7 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 		_g_object_unref0 (_tmp2_);
 #line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp8_;
-#line 3161 "LibraryWindow.c"
+#line 3235 "LibraryWindow.c"
 	}
 #line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _g_object_ref0 (_tmp2_);
@@ -3167,7 +3241,7 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 	_tmp12_ = sources;
 #line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ != NULL) {
-#line 3171 "LibraryWindow.c"
+#line 3245 "LibraryWindow.c"
 		GeeList* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
 		gint _tmp15_ = 0;
@@ -3179,15 +3253,15 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 		_tmp15_ = _tmp14_;
 #line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp15_ != 0;
-#line 3183 "LibraryWindow.c"
+#line 3257 "LibraryWindow.c"
 	} else {
 #line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = FALSE;
-#line 3187 "LibraryWindow.c"
+#line 3261 "LibraryWindow.c"
 	}
 #line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_) {
-#line 3191 "LibraryWindow.c"
+#line 3265 "LibraryWindow.c"
 		GeeList* _tmp16_ = NULL;
 		gpointer _tmp17_ = NULL;
 #line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3198,13 +3272,13 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 		_g_object_unref0 (_tmp10_);
 #line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp17_, TYPE_PHOTO, Photo);
-#line 3202 "LibraryWindow.c"
+#line 3276 "LibraryWindow.c"
 	} else {
 #line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp10_);
 #line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = NULL;
-#line 3208 "LibraryWindow.c"
+#line 3282 "LibraryWindow.c"
 	}
 #line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp10_;
@@ -3216,7 +3290,7 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 	_data_collection_unref0 (view);
 #line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3220 "LibraryWindow.c"
+#line 3294 "LibraryWindow.c"
 }
 
 
@@ -3248,7 +3322,7 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 	_tmp0_ = page;
 #line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_COLLECTION_PAGE)) {
-#line 3252 "LibraryWindow.c"
+#line 3326 "LibraryWindow.c"
 		Page* _tmp1_ = NULL;
 		CollectionPage* _tmp2_ = NULL;
 		Photo* photo = NULL;
@@ -3283,35 +3357,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3287 "LibraryWindow.c"
+#line 3361 "LibraryWindow.c"
 			} else {
 #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3291 "LibraryWindow.c"
+#line 3365 "LibraryWindow.c"
 			}
 #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3297 "LibraryWindow.c"
+#line 3371 "LibraryWindow.c"
 			} else {
 #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3301 "LibraryWindow.c"
+#line 3375 "LibraryWindow.c"
 			}
 #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3307 "LibraryWindow.c"
+#line 3381 "LibraryWindow.c"
 			} else {
 #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3311 "LibraryWindow.c"
+#line 3385 "LibraryWindow.c"
 			}
 #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3315 "LibraryWindow.c"
+#line 3389 "LibraryWindow.c"
 		}
 #line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = photo;
@@ -3333,41 +3407,41 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		if (collection) {
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3337 "LibraryWindow.c"
+#line 3411 "LibraryWindow.c"
 		} else {
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3341 "LibraryWindow.c"
+#line 3415 "LibraryWindow.c"
 		}
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3347 "LibraryWindow.c"
+#line 3421 "LibraryWindow.c"
 		} else {
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3351 "LibraryWindow.c"
+#line 3425 "LibraryWindow.c"
 		}
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3357 "LibraryWindow.c"
+#line 3431 "LibraryWindow.c"
 		} else {
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3361 "LibraryWindow.c"
+#line 3435 "LibraryWindow.c"
 		}
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3365 "LibraryWindow.c"
+#line 3439 "LibraryWindow.c"
 	}
 #line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = page;
 #line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENTS_DIRECTORY_PAGE)) {
-#line 3371 "LibraryWindow.c"
+#line 3445 "LibraryWindow.c"
 		ViewCollection* view = NULL;
 		Page* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
@@ -3413,35 +3487,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3417 "LibraryWindow.c"
+#line 3491 "LibraryWindow.c"
 			} else {
 #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3421 "LibraryWindow.c"
+#line 3495 "LibraryWindow.c"
 			}
 #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3427 "LibraryWindow.c"
+#line 3501 "LibraryWindow.c"
 			} else {
 #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3431 "LibraryWindow.c"
+#line 3505 "LibraryWindow.c"
 			}
 #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3437 "LibraryWindow.c"
+#line 3511 "LibraryWindow.c"
 			} else {
 #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3441 "LibraryWindow.c"
+#line 3515 "LibraryWindow.c"
 			}
 #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3445 "LibraryWindow.c"
+#line 3519 "LibraryWindow.c"
 		}
 #line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = view;
@@ -3471,35 +3545,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3475 "LibraryWindow.c"
+#line 3549 "LibraryWindow.c"
 			} else {
 #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3479 "LibraryWindow.c"
+#line 3553 "LibraryWindow.c"
 			}
 #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3485 "LibraryWindow.c"
+#line 3559 "LibraryWindow.c"
 			} else {
 #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3489 "LibraryWindow.c"
+#line 3563 "LibraryWindow.c"
 			}
 #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3495 "LibraryWindow.c"
+#line 3569 "LibraryWindow.c"
 			} else {
 #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3499 "LibraryWindow.c"
+#line 3573 "LibraryWindow.c"
 			}
 #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3503 "LibraryWindow.c"
+#line 3577 "LibraryWindow.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = self->priv->events_branch;
@@ -3525,35 +3599,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3529 "LibraryWindow.c"
+#line 3603 "LibraryWindow.c"
 			} else {
 #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3533 "LibraryWindow.c"
+#line 3607 "LibraryWindow.c"
 			}
 #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3539 "LibraryWindow.c"
+#line 3613 "LibraryWindow.c"
 			} else {
 #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3543 "LibraryWindow.c"
+#line 3617 "LibraryWindow.c"
 			}
 #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3549 "LibraryWindow.c"
+#line 3623 "LibraryWindow.c"
 			} else {
 #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3553 "LibraryWindow.c"
+#line 3627 "LibraryWindow.c"
 			}
 #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3557 "LibraryWindow.c"
+#line 3631 "LibraryWindow.c"
 		}
 #line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = entry;
@@ -3587,35 +3661,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3591 "LibraryWindow.c"
+#line 3665 "LibraryWindow.c"
 			} else {
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3595 "LibraryWindow.c"
+#line 3669 "LibraryWindow.c"
 			}
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3601 "LibraryWindow.c"
+#line 3675 "LibraryWindow.c"
 			} else {
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3605 "LibraryWindow.c"
+#line 3679 "LibraryWindow.c"
 			}
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3611 "LibraryWindow.c"
+#line 3685 "LibraryWindow.c"
 			} else {
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3615 "LibraryWindow.c"
+#line 3689 "LibraryWindow.c"
 			}
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3619 "LibraryWindow.c"
+#line 3693 "LibraryWindow.c"
 		}
 #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = photo;
@@ -3643,41 +3717,41 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		if (collection) {
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3647 "LibraryWindow.c"
+#line 3721 "LibraryWindow.c"
 		} else {
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3651 "LibraryWindow.c"
+#line 3725 "LibraryWindow.c"
 		}
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3657 "LibraryWindow.c"
+#line 3731 "LibraryWindow.c"
 		} else {
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3661 "LibraryWindow.c"
+#line 3735 "LibraryWindow.c"
 		}
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3667 "LibraryWindow.c"
+#line 3741 "LibraryWindow.c"
 		} else {
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3671 "LibraryWindow.c"
+#line 3745 "LibraryWindow.c"
 		}
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3675 "LibraryWindow.c"
+#line 3749 "LibraryWindow.c"
 	}
 #line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = page;
 #line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 3681 "LibraryWindow.c"
+#line 3755 "LibraryWindow.c"
 		LibraryPhotoPage* photo_page = NULL;
 		Page* _tmp31_ = NULL;
 		LibraryPhotoPage* _tmp32_ = NULL;
@@ -3719,35 +3793,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3723 "LibraryWindow.c"
+#line 3797 "LibraryWindow.c"
 			} else {
 #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3727 "LibraryWindow.c"
+#line 3801 "LibraryWindow.c"
 			}
 #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3733 "LibraryWindow.c"
+#line 3807 "LibraryWindow.c"
 			} else {
 #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3737 "LibraryWindow.c"
+#line 3811 "LibraryWindow.c"
 			}
 #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3743 "LibraryWindow.c"
+#line 3817 "LibraryWindow.c"
 			} else {
 #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3747 "LibraryWindow.c"
+#line 3821 "LibraryWindow.c"
 			}
 #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3751 "LibraryWindow.c"
+#line 3825 "LibraryWindow.c"
 		}
 #line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = photo_page;
@@ -3765,35 +3839,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3769 "LibraryWindow.c"
+#line 3843 "LibraryWindow.c"
 			} else {
 #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3773 "LibraryWindow.c"
+#line 3847 "LibraryWindow.c"
 			}
 #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3779 "LibraryWindow.c"
+#line 3853 "LibraryWindow.c"
 			} else {
 #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3783 "LibraryWindow.c"
+#line 3857 "LibraryWindow.c"
 			}
 #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3789 "LibraryWindow.c"
+#line 3863 "LibraryWindow.c"
 			} else {
 #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3793 "LibraryWindow.c"
+#line 3867 "LibraryWindow.c"
 			}
 #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3797 "LibraryWindow.c"
+#line 3871 "LibraryWindow.c"
 		}
 #line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp38_ = controller;
@@ -3829,35 +3903,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		if (collection) {
 #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3833 "LibraryWindow.c"
+#line 3907 "LibraryWindow.c"
 		} else {
 #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3837 "LibraryWindow.c"
+#line 3911 "LibraryWindow.c"
 		}
 #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
 #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3843 "LibraryWindow.c"
+#line 3917 "LibraryWindow.c"
 		} else {
 #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3847 "LibraryWindow.c"
+#line 3921 "LibraryWindow.c"
 		}
 #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
 #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3853 "LibraryWindow.c"
+#line 3927 "LibraryWindow.c"
 		} else {
 #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3857 "LibraryWindow.c"
+#line 3931 "LibraryWindow.c"
 		}
 #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3861 "LibraryWindow.c"
+#line 3935 "LibraryWindow.c"
 	}
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
@@ -3865,35 +3939,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 	if (collection) {
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*collection = _vala_collection;
-#line 3869 "LibraryWindow.c"
+#line 3943 "LibraryWindow.c"
 	} else {
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 3873 "LibraryWindow.c"
+#line 3947 "LibraryWindow.c"
 	}
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (start) {
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*start = _vala_start;
-#line 3879 "LibraryWindow.c"
+#line 3953 "LibraryWindow.c"
 	} else {
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 3883 "LibraryWindow.c"
+#line 3957 "LibraryWindow.c"
 	}
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (view_collection) {
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*view_collection = _vala_view_collection;
-#line 3889 "LibraryWindow.c"
+#line 3963 "LibraryWindow.c"
 	} else {
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 3893 "LibraryWindow.c"
+#line 3967 "LibraryWindow.c"
 	}
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3897 "LibraryWindow.c"
+#line 3971 "LibraryWindow.c"
 }
 
 
@@ -3930,7 +4004,7 @@ static void library_window_real_on_fullscreen (AppWindow* base) {
 		_g_object_unref0 (current_page);
 #line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 3934 "LibraryWindow.c"
+#line 4008 "LibraryWindow.c"
 	}
 #line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = NULL;
@@ -3962,7 +4036,7 @@ static void library_window_real_on_fullscreen (AppWindow* base) {
 		_g_object_unref0 (current_page);
 #line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 3966 "LibraryWindow.c"
+#line 4040 "LibraryWindow.c"
 	}
 #line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = collection;
@@ -3990,14 +4064,14 @@ static void library_window_real_on_fullscreen (AppWindow* base) {
 	_g_object_unref0 (collection);
 #line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 3994 "LibraryWindow.c"
+#line 4068 "LibraryWindow.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
 #line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	var = (g_free (var), NULL);
-#line 4001 "LibraryWindow.c"
+#line 4075 "LibraryWindow.c"
 }
 
 
@@ -4006,7 +4080,7 @@ static void _g_slist_free__g_free0_ (GSList* self) {
 	g_slist_foreach (self, (GFunc) _g_free0_, NULL);
 #line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_slist_free (self);
-#line 4010 "LibraryWindow.c"
+#line 4084 "LibraryWindow.c"
 }
 
 
@@ -4059,7 +4133,7 @@ static void library_window_on_file_import (LibraryWindow* self) {
 	_tmp8_ = response;
 #line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ == ((gint) GTK_RESPONSE_OK)) {
-#line 4063 "LibraryWindow.c"
+#line 4137 "LibraryWindow.c"
 		GtkResponseType _tmp9_ = 0;
 		GtkFileChooserDialog* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
@@ -4092,14 +4166,14 @@ static void library_window_on_file_import (LibraryWindow* self) {
 		if (_tmp16_) {
 #line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = GTK_RESPONSE_REJECT;
-#line 4096 "LibraryWindow.c"
+#line 4170 "LibraryWindow.c"
 		} else {
 			GtkResponseType _tmp17_ = 0;
 #line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = copy_files_dialog ();
 #line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = _tmp17_;
-#line 4103 "LibraryWindow.c"
+#line 4177 "LibraryWindow.c"
 		}
 #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		copy_files_response = _tmp9_;
@@ -4107,7 +4181,7 @@ static void library_window_on_file_import (LibraryWindow* self) {
 		_tmp18_ = copy_files_response;
 #line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp18_ != GTK_RESPONSE_CANCEL) {
-#line 4111 "LibraryWindow.c"
+#line 4185 "LibraryWindow.c"
 			GtkFileChooserDialog* _tmp19_ = NULL;
 			GSList* _tmp20_ = NULL;
 			GSList* _tmp21_ = NULL;
@@ -4124,7 +4198,7 @@ static void library_window_on_file_import (LibraryWindow* self) {
 			library_window_dispatch_import_jobs (self, _tmp21_, "folders", _tmp22_ == GTK_RESPONSE_ACCEPT);
 #line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			__g_slist_free__g_free0_0 (_tmp21_);
-#line 4128 "LibraryWindow.c"
+#line 4202 "LibraryWindow.c"
 		}
 	}
 #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4141,7 +4215,7 @@ static void library_window_on_file_import (LibraryWindow* self) {
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget));
 #line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 4145 "LibraryWindow.c"
+#line 4219 "LibraryWindow.c"
 }
 
 
@@ -4158,7 +4232,7 @@ static void library_window_on_external_library_import (LibraryWindow* self) {
 	gtk_dialog_run (import_dialog);
 #line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 4162 "LibraryWindow.c"
+#line 4236 "LibraryWindow.c"
 }
 
 
@@ -4188,7 +4262,7 @@ static void library_window_real_update_common_action_availability (AppWindow* ba
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar", is_checkerboard);
 #line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFind", is_checkerboard);
-#line 4192 "LibraryWindow.c"
+#line 4266 "LibraryWindow.c"
 }
 
 
@@ -4248,7 +4322,7 @@ static void library_window_real_update_common_actions (AppWindow* base, Page* pa
 	_g_object_unref0 (start);
 #line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 4252 "LibraryWindow.c"
+#line 4326 "LibraryWindow.c"
 }
 
 
@@ -4260,7 +4334,7 @@ static void library_window_on_trashcan_contents_altered (LibraryWindow* self) {
 	_tmp0_ = library_window_can_empty_trash (self);
 #line 558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp0_);
-#line 4264 "LibraryWindow.c"
+#line 4338 "LibraryWindow.c"
 }
 
 
@@ -4279,7 +4353,7 @@ static gboolean library_window_can_empty_trash (LibraryWindow* self) {
 	if (_tmp2_ > 0) {
 #line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = TRUE;
-#line 4283 "LibraryWindow.c"
+#line 4357 "LibraryWindow.c"
 	} else {
 		VideoSourceCollection* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
@@ -4289,13 +4363,13 @@ static gboolean library_window_can_empty_trash (LibraryWindow* self) {
 		_tmp4_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_ > 0;
-#line 4293 "LibraryWindow.c"
+#line 4367 "LibraryWindow.c"
 	}
 #line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
 #line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4299 "LibraryWindow.c"
+#line 4373 "LibraryWindow.c"
 }
 
 
@@ -4354,7 +4428,7 @@ static void library_window_on_empty_trash (LibraryWindow* self) {
 	_command_manager_unref0 (_tmp10_);
 #line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (to_remove);
-#line 4358 "LibraryWindow.c"
+#line 4432 "LibraryWindow.c"
 }
 
 
@@ -4371,7 +4445,7 @@ static void library_window_on_new_search (LibraryWindow* self) {
 	saved_search_dialog_show (_tmp1_);
 #line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_saved_search_dialog_unref0 (_tmp1_);
-#line 4375 "LibraryWindow.c"
+#line 4449 "LibraryWindow.c"
 }
 
 
@@ -4404,7 +4478,7 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
 #line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ == 1) {
-#line 4408 "LibraryWindow.c"
+#line 4482 "LibraryWindow.c"
 		DataSource* selected_source = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		DataSource* _tmp7_ = NULL;
@@ -4427,14 +4501,14 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 			_data_collection_unref0 (view);
 #line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 4431 "LibraryWindow.c"
+#line 4505 "LibraryWindow.c"
 		} else {
 			DataSource* _tmp9_ = NULL;
 #line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = selected_source;
 #line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE)) {
-#line 4438 "LibraryWindow.c"
+#line 4512 "LibraryWindow.c"
 				ViewCollection* _tmp10_ = NULL;
 				DataSource* _tmp11_ = NULL;
 				MediaSource* _tmp12_ = NULL;
@@ -4465,7 +4539,7 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 				_data_collection_unref0 (view);
 #line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 4469 "LibraryWindow.c"
+#line 4543 "LibraryWindow.c"
 			} else {
 #line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = FALSE;
@@ -4475,12 +4549,12 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 				_data_collection_unref0 (view);
 #line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 4479 "LibraryWindow.c"
+#line 4553 "LibraryWindow.c"
 			}
 		}
 #line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (selected_source);
-#line 4484 "LibraryWindow.c"
+#line 4558 "LibraryWindow.c"
 	} else {
 #line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = FALSE;
@@ -4488,11 +4562,11 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 		_data_collection_unref0 (view);
 #line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 4492 "LibraryWindow.c"
+#line 4566 "LibraryWindow.c"
 	}
 #line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 4496 "LibraryWindow.c"
+#line 4570 "LibraryWindow.c"
 }
 
 
@@ -4537,7 +4611,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 		_data_collection_unref0 (view);
 #line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4541 "LibraryWindow.c"
+#line 4615 "LibraryWindow.c"
 	}
 #line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = view;
@@ -4549,7 +4623,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 	if (_tmp8_ == NULL) {
 #line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4553 "LibraryWindow.c"
+#line 4627 "LibraryWindow.c"
 	}
 #line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	media = _tmp8_;
@@ -4563,7 +4637,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 		_data_collection_unref0 (view);
 #line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4567 "LibraryWindow.c"
+#line 4641 "LibraryWindow.c"
 	}
 #line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = media;
@@ -4577,7 +4651,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 	_g_object_unref0 (_tmp12_);
 #line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 4581 "LibraryWindow.c"
+#line 4655 "LibraryWindow.c"
 		MediaSource* _tmp14_ = NULL;
 		Event* _tmp15_ = NULL;
 		Event* _tmp16_ = NULL;
@@ -4591,20 +4665,20 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 		library_window_switch_to_event (self, _tmp16_);
 #line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp16_);
-#line 4595 "LibraryWindow.c"
+#line 4669 "LibraryWindow.c"
 	}
 #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (media);
 #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 4601 "LibraryWindow.c"
+#line 4675 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new2 (gboolean value) {
+static GVariant* _variant_new5 (gboolean value) {
 #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4608 "LibraryWindow.c"
+#line 4682 "LibraryWindow.c"
 }
 
 
@@ -4623,7 +4697,7 @@ static void library_window_on_find (LibraryWindow* self) {
 #line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
 #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = _variant_new2 (TRUE);
+	_tmp2_ = _variant_new5 (TRUE);
 #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (action, _tmp2_);
 #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4634,7 +4708,7 @@ static void library_window_on_find (LibraryWindow* self) {
 	search_filter_toolbar_take_focus (_tmp3_);
 #line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 4638 "LibraryWindow.c"
+#line 4712 "LibraryWindow.c"
 }
 
 
@@ -4646,7 +4720,7 @@ static void library_window_on_media_altered (LibraryWindow* self) {
 	_tmp0_ = library_window_can_jump_to_event (self);
 #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp0_);
-#line 4650 "LibraryWindow.c"
+#line 4724 "LibraryWindow.c"
 }
 
 
@@ -4658,13 +4732,13 @@ static void library_window_on_clear_search (LibraryWindow* self) {
 	_tmp0_ = self->priv->is_search_toolbar_visible;
 #line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 4662 "LibraryWindow.c"
+#line 4736 "LibraryWindow.c"
 		SearchFilterActions* _tmp1_ = NULL;
 #line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->search_actions;
 #line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp1_);
-#line 4668 "LibraryWindow.c"
+#line 4742 "LibraryWindow.c"
 	}
 }
 
@@ -4688,7 +4762,7 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 	_tmp3_ = action;
 #line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4692 "LibraryWindow.c"
+#line 4766 "LibraryWindow.c"
 		gint _tmp4_ = 0;
 		GSimpleAction* _tmp5_ = NULL;
 		GVariant* _tmp6_ = NULL;
@@ -4714,19 +4788,19 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 		if (_tmp10_) {
 #line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 0;
-#line 4718 "LibraryWindow.c"
+#line 4792 "LibraryWindow.c"
 		} else {
 #line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 1;
-#line 4722 "LibraryWindow.c"
+#line 4796 "LibraryWindow.c"
 		}
 #line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp4_;
-#line 4726 "LibraryWindow.c"
+#line 4800 "LibraryWindow.c"
 	} else {
 #line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = 1;
-#line 4730 "LibraryWindow.c"
+#line 4804 "LibraryWindow.c"
 	}
 #line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
@@ -4734,7 +4808,7 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 	_g_object_unref0 (action);
 #line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4738 "LibraryWindow.c"
+#line 4812 "LibraryWindow.c"
 }
 
 
@@ -4767,7 +4841,7 @@ static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleA
 	_tmp5_ = value;
 #line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 4771 "LibraryWindow.c"
+#line 4845 "LibraryWindow.c"
 }
 
 
@@ -4776,7 +4850,7 @@ static void library_window_on_preferences (LibraryWindow* self) {
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	preferences_dialog_show ();
-#line 4780 "LibraryWindow.c"
+#line 4854 "LibraryWindow.c"
 }
 
 
@@ -4804,7 +4878,7 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi
 	_tmp2_ = display;
 #line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 4808 "LibraryWindow.c"
+#line 4882 "LibraryWindow.c"
 		BasicProperties* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
@@ -4823,7 +4897,7 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi
 		_tmp6_ = self->priv->bottom_frame;
 #line 650 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 4827 "LibraryWindow.c"
+#line 4901 "LibraryWindow.c"
 	} else {
 		GtkPaned* _tmp7_ = NULL;
 		GtkWidget* _tmp8_ = NULL;
@@ -4833,13 +4907,13 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi
 		_tmp8_ = gtk_paned_get_child2 (_tmp7_);
 #line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp8_ != NULL) {
-#line 4837 "LibraryWindow.c"
+#line 4911 "LibraryWindow.c"
 			GtkFrame* _tmp9_ = NULL;
 #line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = self->priv->bottom_frame;
 #line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 4843 "LibraryWindow.c"
+#line 4917 "LibraryWindow.c"
 		}
 	}
 #line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4858,21 +4932,21 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi
 	_tmp14_ = value;
 #line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp13_, _tmp14_);
-#line 4862 "LibraryWindow.c"
+#line 4936 "LibraryWindow.c"
 }
 
 
-static gboolean _variant_get3 (GVariant* value) {
+static gboolean _variant_get6 (GVariant* value) {
 #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_get_boolean (value);
-#line 4869 "LibraryWindow.c"
+#line 4943 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new4 (gboolean value) {
+static GVariant* _variant_new7 (gboolean value) {
 #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4876 "LibraryWindow.c"
+#line 4950 "LibraryWindow.c"
 }
 
 
@@ -4896,9 +4970,9 @@ static void library_window_on_action_toggle (LibraryWindow* self, GAction* actio
 #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
 #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _variant_get3 (_tmp2_);
+	_tmp3_ = _variant_get6 (_tmp2_);
 #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = _variant_new4 (!_tmp3_);
+	_tmp4_ = _variant_new7 (!_tmp3_);
 #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
 #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4911,7 +4985,7 @@ static void library_window_on_action_toggle (LibraryWindow* self, GAction* actio
 	g_action_change_state (_tmp6_, new_state);
 #line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (new_state);
-#line 4915 "LibraryWindow.c"
+#line 4989 "LibraryWindow.c"
 }
 
 
@@ -4928,7 +5002,7 @@ static void library_window_on_action_radio (LibraryWindow* self, GAction* action
 	_tmp1_ = value;
 #line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp0_, _tmp1_);
-#line 4932 "LibraryWindow.c"
+#line 5006 "LibraryWindow.c"
 }
 
 
@@ -4953,7 +5027,7 @@ static void library_window_on_display_extended_properties (LibraryWindow* self,
 	_tmp2_ = display;
 #line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 4957 "LibraryWindow.c"
+#line 5031 "LibraryWindow.c"
 		ExtendedPropertiesWindow* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
@@ -4972,14 +5046,14 @@ static void library_window_on_display_extended_properties (LibraryWindow* self,
 		_tmp6_ = self->priv->extended_properties;
 #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 4976 "LibraryWindow.c"
+#line 5050 "LibraryWindow.c"
 	} else {
 		ExtendedPropertiesWindow* _tmp7_ = NULL;
 #line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->extended_properties;
 #line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 4983 "LibraryWindow.c"
+#line 5057 "LibraryWindow.c"
 	}
 #line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = action;
@@ -4987,7 +5061,14 @@ static void library_window_on_display_extended_properties (LibraryWindow* self,
 	_tmp9_ = value;
 #line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 4991 "LibraryWindow.c"
+#line 5065 "LibraryWindow.c"
+}
+
+
+static GVariant* _variant_new8 (gboolean value) {
+#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 5072 "LibraryWindow.c"
 }
 
 
@@ -5019,13 +5100,15 @@ static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAct
 	_g_object_unref0 (_tmp3_);
 #line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_search_bar (self, is_shown);
-#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = action;
-#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = value;
-#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp5_ = _variant_new8 (is_shown);
+#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 5029 "LibraryWindow.c"
+#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp5_);
+#line 5112 "LibraryWindow.c"
 }
 
 
@@ -5039,55 +5122,55 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) {
 	CheckerboardPage* _tmp6_ = NULL;
 	CheckerboardPage* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_CHECKERBOARD_PAGE);
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 5057 "LibraryWindow.c"
+#line 5140 "LibraryWindow.c"
 	}
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 696 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = display;
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 696 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->is_search_toolbar_visible = _tmp3_;
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = library_window_should_show_search_bar (self);
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp5_) : NULL;
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ == NULL) {
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 5073 "LibraryWindow.c"
+#line 5156 "LibraryWindow.c"
 	}
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_toggle_search_bar (self, _tmp4_, _tmp7_);
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = display;
-#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp8_) {
-#line 5085 "LibraryWindow.c"
+#line 5168 "LibraryWindow.c"
 		SearchFilterActions* _tmp9_ = NULL;
-#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->search_actions;
-#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp9_);
-#line 5091 "LibraryWindow.c"
+#line 5174 "LibraryWindow.c"
 	}
 }
 
@@ -5097,23 +5180,23 @@ static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleActio
 	gboolean _tmp1_ = FALSE;
 	GSimpleAction* _tmp2_ = NULL;
 	GVariant* _tmp3_ = NULL;
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = variant;
-#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_sidebar_visible (self, _tmp1_);
-#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = action;
-#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = variant;
-#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5117 "LibraryWindow.c"
+#line 5200 "LibraryWindow.c"
 }
 
 
@@ -5123,25 +5206,25 @@ static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean vi
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->sidebar_paned;
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = visible;
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = visible;
-#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
-#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 5145 "LibraryWindow.c"
+#line 5228 "LibraryWindow.c"
 }
 
 
@@ -5151,23 +5234,23 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self) {
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = configuration_facade_get_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp3_;
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5171 "LibraryWindow.c"
+#line 5254 "LibraryWindow.c"
 }
 
 
@@ -5176,78 +5259,95 @@ static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleActio
 	gboolean _tmp1_ = FALSE;
 	GSimpleAction* _tmp2_ = NULL;
 	GVariant* _tmp3_ = NULL;
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 717 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 717 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = variant;
-#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_toolbar_visible (self, _tmp1_);
-#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = action;
-#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = variant;
-#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5196 "LibraryWindow.c"
+#line 5279 "LibraryWindow.c"
 }
 
 
 static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean visible) {
-	GtkToolbar* toolbar = NULL;
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-	GtkToolbar* _tmp2_ = NULL;
-	GtkToolbar* _tmp3_ = NULL;
-	GtkToolbar* _tmp4_ = NULL;
-	ConfigFacade* _tmp7_ = NULL;
-	ConfigFacade* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gboolean _tmp2_ = FALSE;
+	GtkToolbar* toolbar = NULL;
+	Page* _tmp3_ = NULL;
+	Page* _tmp4_ = NULL;
+	GtkToolbar* _tmp5_ = NULL;
+	GtkToolbar* _tmp6_ = NULL;
+	GtkToolbar* _tmp7_ = NULL;
+	ConfigFacade* _tmp10_ = NULL;
+	ConfigFacade* _tmp11_ = NULL;
+	gboolean _tmp12_ = FALSE;
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = page_get_toolbar (_tmp1_);
-#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _tmp2_;
-#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp2_ = _tmp1_ == NULL;
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp2_) {
 #line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	toolbar = _tmp3_;
-#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = toolbar;
-#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp4_ != NULL) {
-#line 5228 "LibraryWindow.c"
-		GtkToolbar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
-#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = toolbar;
-#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = visible;
-#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _tmp6_);
-#line 5237 "LibraryWindow.c"
+		return;
+#line 5310 "LibraryWindow.c"
 	}
+#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp4_ = _tmp3_;
+#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp5_ = page_get_toolbar (_tmp4_);
+#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp6_ = _tmp5_;
+#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp4_);
+#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	toolbar = _tmp6_;
 #line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = config_facade_get_instance ();
-#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = _tmp7_;
-#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = visible;
-#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp9_);
+	_tmp7_ = toolbar;
 #line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp8_);
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp7_ != NULL) {
+#line 5328 "LibraryWindow.c"
+		GtkRevealer* _tmp8_ = NULL;
+		gboolean _tmp9_ = FALSE;
+#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp8_ = self->priv->toolbar_revealer;
+#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp9_ = visible;
+#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_revealer_set_reveal_child (_tmp8_, _tmp9_);
+#line 5337 "LibraryWindow.c"
+	}
+#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp10_ = config_facade_get_instance ();
+#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp11_ = _tmp10_;
+#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp12_ = visible;
+#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
+#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp11_);
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
-#line 5251 "LibraryWindow.c"
+#line 5351 "LibraryWindow.c"
 }
 
 
@@ -5257,48 +5357,48 @@ static gboolean library_window_is_toolbar_visible (LibraryWindow* self) {
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = configuration_facade_get_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp3_;
-#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5277 "LibraryWindow.c"
+#line 5377 "LibraryWindow.c"
 }
 
 
 static void library_window_show_extended_properties (LibraryWindow* self) {
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 739 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, TRUE);
-#line 5286 "LibraryWindow.c"
+#line 5386 "LibraryWindow.c"
 }
 
 
 static void library_window_hide_extended_properties (LibraryWindow* self) {
-#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, FALSE);
-#line 5295 "LibraryWindow.c"
+#line 5395 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new5 (gboolean value) {
-#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+static GVariant* _variant_new9 (gboolean value) {
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5302 "LibraryWindow.c"
+#line 5402 "LibraryWindow.c"
 }
 
 
@@ -5311,35 +5411,35 @@ static void library_window_sync_extended_properties (LibraryWindow* self, gboole
 	ConfigFacade* _tmp4_ = NULL;
 	ConfigFacade* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties");
-#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
-#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = show;
-#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _variant_new5 (_tmp2_);
-#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp3_ = _variant_new9 (_tmp2_);
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (action, _tmp3_);
-#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp3_);
 #line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp3_);
+#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = show;
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_);
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 5343 "LibraryWindow.c"
+#line 5443 "LibraryWindow.c"
 }
 
 
@@ -5349,44 +5449,44 @@ void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batc
 	LibraryImportQueueSidebarEntry* _tmp2_ = NULL;
 	BatchImport* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (batch_import));
-#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_import_queue_entry (_tmp0_);
-#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = batch_import;
-#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = allow_user_cancel;
-#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, _tmp3_, _tmp4_);
-#line 5369 "LibraryWindow.c"
+#line 5469 "LibraryWindow.c"
 }
 
 
 static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest) {
 	ImportManifest* _tmp0_ = NULL;
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 759 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 759 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = manifest;
-#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_ui_report_manifest (_tmp0_, TRUE, NULL);
-#line 5383 "LibraryWindow.c"
+#line 5483 "LibraryWindow.c"
 }
 
 
 static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_import_reporter ((LibraryWindow*) self, manifest);
-#line 5390 "LibraryWindow.c"
+#line 5490 "LibraryWindow.c"
 }
 
 
@@ -5404,43 +5504,43 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 	GeeArrayList* _tmp33_ = NULL;
 	gint _tmp34_ = 0;
 	gint _tmp35_ = 0;
-#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (job_name != NULL);
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = app_dirs_get_import_dir ();
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = g_get_home_dir ();
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = g_strcmp0 (_tmp4_, _tmp5_) == 0;
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_) {
-#line 5430 "LibraryWindow.c"
+#line 5530 "LibraryWindow.c"
 		gboolean _tmp7_ = FALSE;
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->notify_library_is_home_dir;
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp7_;
-#line 5436 "LibraryWindow.c"
+#line 5536 "LibraryWindow.c"
 	} else {
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 5440 "LibraryWindow.c"
+#line 5540 "LibraryWindow.c"
 	}
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 5444 "LibraryWindow.c"
+#line 5544 "LibraryWindow.c"
 		GtkResponseType response = 0;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -5452,65 +5552,65 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 		GtkResponseType _tmp15_ = 0;
 		GtkResponseType _tmp16_ = 0;
 		GtkResponseType _tmp17_ = 0;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _ ("Shotwell is configured to import photos to your home directory.\n" "We recommend changing this in <span weight=\"bold\">Edit %s Preference" \
 "s</span>.\n" "Do you want to continue importing photos?");
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = g_strdup_printf (_tmp8_, "▸");
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _ ("_Import");
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _ ("Library Location");
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = app_window_get_instance ();
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = _tmp13_;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = app_window_affirm_cancel_question (_tmp10_, _tmp11_, _tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp14_);
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp10_);
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		response = _tmp16_;
-#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = response;
-#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp17_ == GTK_RESPONSE_CANCEL) {
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return;
-#line 5486 "LibraryWindow.c"
+#line 5586 "LibraryWindow.c"
 		}
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->notify_library_is_home_dir = FALSE;
-#line 5490 "LibraryWindow.c"
+#line 5590 "LibraryWindow.c"
 	}
-#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/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);
-#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	jobs = _tmp18_;
-#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = uris;
-#line 5498 "LibraryWindow.c"
+#line 5598 "LibraryWindow.c"
 	{
 		GSList* uri_collection = NULL;
 		GSList* uri_it = NULL;
-#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection = _tmp19_;
-#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 5506 "LibraryWindow.c"
+#line 5606 "LibraryWindow.c"
 			gchar* _tmp20_ = NULL;
 			gchar* uri = NULL;
-#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = g_strdup ((const gchar*) uri_it->data);
-#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri = _tmp20_;
-#line 5513 "LibraryWindow.c"
+#line 5613 "LibraryWindow.c"
 			{
 				GFile* file_or_dir = NULL;
 				const gchar* _tmp21_ = NULL;
@@ -5524,95 +5624,95 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 				gboolean _tmp30_ = FALSE;
 				FileImportJob* _tmp31_ = NULL;
 				FileImportJob* _tmp32_ = NULL;
-#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = uri;
-#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = g_file_new_for_uri (_tmp21_);
-#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				file_or_dir = _tmp22_;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp23_ = file_or_dir;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp24_ = g_file_get_path (_tmp23_);
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp25_ = _tmp24_;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp26_ = _tmp25_ == NULL;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (_tmp25_);
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				if (_tmp26_) {
-#line 5545 "LibraryWindow.c"
+#line 5645 "LibraryWindow.c"
 					const gchar* _tmp27_ = NULL;
-#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 782 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp27_ = _ ("Photos cannot be imported from this directory.");
-#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 782 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					app_window_error_message (_tmp27_, NULL);
-#line 781 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_object_unref0 (file_or_dir);
-#line 781 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
-#line 781 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					continue;
-#line 5557 "LibraryWindow.c"
+#line 5657 "LibraryWindow.c"
 				}
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp28_ = jobs;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp29_ = file_or_dir;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp30_ = copy_to_library;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp31_ = file_import_job_new (_tmp29_, _tmp30_);
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp32_ = _tmp31_;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_);
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_batch_import_job_unref0 (_tmp32_);
-#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (file_or_dir);
-#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 5577 "LibraryWindow.c"
+#line 5677 "LibraryWindow.c"
 			}
 		}
 	}
-#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = jobs;
-#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = _tmp34_;
-#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp35_ > 0) {
-#line 5589 "LibraryWindow.c"
+#line 5689 "LibraryWindow.c"
 		BatchImport* batch_import = NULL;
 		GeeArrayList* _tmp36_ = NULL;
 		const gchar* _tmp37_ = NULL;
 		BatchImport* _tmp38_ = NULL;
 		BatchImport* _tmp39_ = NULL;
-#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = jobs;
-#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp37_ = job_name;
-#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp38_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ITERABLE, GeeIterable), _tmp37_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL);
-#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		batch_import = _tmp38_;
-#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp39_ = batch_import;
-#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_enqueue_batch_import (self, _tmp39_, TRUE);
-#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_import_queue_page (self);
-#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (batch_import);
-#line 5611 "LibraryWindow.c"
+#line 5711 "LibraryWindow.c"
 	}
-#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (jobs);
-#line 5615 "LibraryWindow.c"
+#line 5715 "LibraryWindow.c"
 }
 
 
@@ -5633,157 +5733,157 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_ = FALSE;
-#line 794 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
 #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gdk_display_get_default ();
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = gdk_display_get_device_manager (_tmp1_);
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = gdk_device_manager_get_client_pointer (_tmp2_);
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gdk_window_get_device_position (_tmp0_, _tmp3_, NULL, NULL, &_tmp4_);
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	mask = _tmp4_;
 #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	mask = _tmp4_;
+#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = mask;
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	ctrl = (_tmp5_ & GDK_CONTROL_MASK) != 0;
-#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = mask;
-#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	alt = (_tmp6_ & GDK_MOD1_MASK) != 0;
-#line 802 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = mask;
-#line 802 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	shift = (_tmp7_ & GDK_SHIFT_MASK) != 0;
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = ctrl;
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp10_) {
-#line 5666 "LibraryWindow.c"
+#line 5766 "LibraryWindow.c"
 		gboolean _tmp11_ = FALSE;
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = alt;
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = !_tmp11_;
-#line 5672 "LibraryWindow.c"
+#line 5772 "LibraryWindow.c"
 	} else {
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = FALSE;
-#line 5676 "LibraryWindow.c"
+#line 5776 "LibraryWindow.c"
 	}
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
-#line 5680 "LibraryWindow.c"
+#line 5780 "LibraryWindow.c"
 		gboolean _tmp12_ = FALSE;
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = shift;
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = !_tmp12_;
-#line 5686 "LibraryWindow.c"
+#line 5786 "LibraryWindow.c"
 	} else {
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = FALSE;
-#line 5690 "LibraryWindow.c"
+#line 5790 "LibraryWindow.c"
 	}
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
-#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = GDK_ACTION_COPY;
-#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5698 "LibraryWindow.c"
+#line 5798 "LibraryWindow.c"
 	} else {
 		gboolean _tmp13_ = FALSE;
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_ = FALSE;
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = ctrl;
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp15_) {
-#line 5707 "LibraryWindow.c"
+#line 5807 "LibraryWindow.c"
 			gboolean _tmp16_ = FALSE;
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = alt;
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = _tmp16_;
-#line 5713 "LibraryWindow.c"
+#line 5813 "LibraryWindow.c"
 		} else {
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = FALSE;
-#line 5717 "LibraryWindow.c"
+#line 5817 "LibraryWindow.c"
 		}
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_) {
-#line 5721 "LibraryWindow.c"
+#line 5821 "LibraryWindow.c"
 			gboolean _tmp17_ = FALSE;
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = shift;
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = !_tmp17_;
-#line 5727 "LibraryWindow.c"
+#line 5827 "LibraryWindow.c"
 		} else {
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = FALSE;
-#line 5731 "LibraryWindow.c"
+#line 5831 "LibraryWindow.c"
 		}
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp13_) {
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = GDK_ACTION_ASK;
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 5739 "LibraryWindow.c"
+#line 5839 "LibraryWindow.c"
 		} else {
 			gboolean _tmp18_ = FALSE;
 			gboolean _tmp19_ = FALSE;
 			gboolean _tmp20_ = FALSE;
-#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = ctrl;
-#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp20_) {
-#line 5748 "LibraryWindow.c"
+#line 5848 "LibraryWindow.c"
 				gboolean _tmp21_ = FALSE;
-#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = alt;
-#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = !_tmp21_;
-#line 5754 "LibraryWindow.c"
+#line 5854 "LibraryWindow.c"
 			} else {
-#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = FALSE;
-#line 5758 "LibraryWindow.c"
+#line 5858 "LibraryWindow.c"
 			}
-#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp19_) {
-#line 5762 "LibraryWindow.c"
+#line 5862 "LibraryWindow.c"
 				gboolean _tmp22_ = FALSE;
-#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = shift;
-#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = _tmp22_;
-#line 5768 "LibraryWindow.c"
+#line 5868 "LibraryWindow.c"
 			} else {
-#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = FALSE;
-#line 5772 "LibraryWindow.c"
+#line 5872 "LibraryWindow.c"
 			}
-#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp18_) {
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_LINK;
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 5780 "LibraryWindow.c"
+#line 5880 "LibraryWindow.c"
 			} else {
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_DEFAULT;
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 5786 "LibraryWindow.c"
+#line 5886 "LibraryWindow.c"
 			}
 		}
 	}
@@ -5807,87 +5907,87 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext
 	GdkDragContext* _tmp13_ = NULL;
 	GdkDragAction _tmp14_ = 0;
 	guint _tmp15_ = 0U;
-#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = context;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gtk_drag_dest_get_target_list (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = gtk_drag_dest_find_target (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_, _tmp1_);
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	target = _tmp2_;
-#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = target;
-#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = GDK_NONE;
-#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == _tmp4_) {
-#line 5828 "LibraryWindow.c"
+#line 5928 "LibraryWindow.c"
 		GdkDragContext* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:817: drag target is GDK_NONE");
-#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:820: drag target is GDK_NONE");
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = context;
-#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = time;
-#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gdk_drag_status (_tmp5_, 0, (guint32) _tmp6_);
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5843 "LibraryWindow.c"
+#line 5943 "LibraryWindow.c"
 	}
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = context;
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = gtk_drag_get_source_widget (_tmp7_);
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 5851 "LibraryWindow.c"
+#line 5951 "LibraryWindow.c"
 		GdkDragContext* _tmp9_ = NULL;
 		guint _tmp10_ = 0U;
-#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = context;
-#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = time;
-#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gdk_drag_status (_tmp9_, GDK_ACTION_PRIVATE, (guint32) _tmp10_);
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5864 "LibraryWindow.c"
+#line 5964 "LibraryWindow.c"
 	}
-#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = library_window_get_drag_action (self);
-#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	drag_action = _tmp11_;
-#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = drag_action;
-#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ == GDK_ACTION_DEFAULT) {
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		drag_action = GDK_ACTION_ASK;
-#line 5876 "LibraryWindow.c"
+#line 5976 "LibraryWindow.c"
 	}
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = context;
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = drag_action;
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = time;
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gdk_drag_status (_tmp13_, _tmp14_, (guint32) _tmp15_);
-#line 838 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = TRUE;
-#line 838 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5890 "LibraryWindow.c"
+#line 5990 "LibraryWindow.c"
 }
 
 
@@ -5897,54 +5997,54 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont
 	guchar* _tmp1_ = NULL;
 	GdkDragContext* _tmp2_ = NULL;
 	GtkWidget* _tmp3_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 846 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = selection_data;
-#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 846 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gtk_selection_data_get_data (_tmp0_);
-#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 846 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (-1 < 0) {
-#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:844: failed to retrieve SelectionData");
-#line 5914 "LibraryWindow.c"
+#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:847: failed to retrieve SelectionData");
+#line 6014 "LibraryWindow.c"
 	}
-#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = context;
-#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = gtk_drag_get_source_widget (_tmp2_);
-#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 5922 "LibraryWindow.c"
+#line 6022 "LibraryWindow.c"
 		GdkDragContext* _tmp4_ = NULL;
 		GtkSelectionData* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
 		guint _tmp7_ = 0U;
-#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = context;
-#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = selection_data;
-#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = info;
-#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = time;
-#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_external_drop_handler (self, _tmp4_, NULL, _tmp5_, _tmp6_, _tmp7_);
-#line 5937 "LibraryWindow.c"
+#line 6037 "LibraryWindow.c"
 	} else {
 		GdkDragContext* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
-#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = context;
-#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = time;
-#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_drag_finish (_tmp8_, FALSE, FALSE, (guint32) _tmp9_);
-#line 5947 "LibraryWindow.c"
+#line 6047 "LibraryWindow.c"
 	}
 }
 
@@ -5967,198 +6067,198 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 	GdkDragAction _tmp22_ = 0;
 	GdkDragContext* _tmp23_ = NULL;
 	guint _tmp24_ = 0U;
-#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((entry == NULL) || SIDEBAR_IS_ENTRY (entry));
-#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (data != NULL);
-#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = data;
-#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_ = gtk_selection_data_get_uris (_tmp0_);
-#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = _tmp2_;
-#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array_length1 = _vala_array_length (_tmp1_);
-#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_uris_array_size_ = uris_array_length1;
-#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris = NULL;
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = uris_array;
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3__length1 = uris_array_length1;
-#line 5994 "LibraryWindow.c"
+#line 6094 "LibraryWindow.c"
 	{
 		gchar** uri_collection = NULL;
 		gint uri_collection_length1 = 0;
 		gint _uri_collection_size_ = 0;
 		gint uri_it = 0;
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection = _tmp3_;
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection_length1 = _tmp3__length1;
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) {
-#line 6006 "LibraryWindow.c"
+#line 6106 "LibraryWindow.c"
 			gchar* _tmp4_ = NULL;
 			gchar* uri = NULL;
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = g_strdup (uri_collection[uri_it]);
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri = _tmp4_;
-#line 6013 "LibraryWindow.c"
+#line 6113 "LibraryWindow.c"
 			{
 				const gchar* _tmp5_ = NULL;
 				gchar* _tmp6_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp5_ = uri;
-#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp6_ = g_strdup (_tmp5_);
-#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uris = g_slist_append (uris, _tmp6_);
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 6025 "LibraryWindow.c"
+#line 6125 "LibraryWindow.c"
 			}
 		}
 	}
-#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = context;
-#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = gdk_drag_context_get_selected_action (_tmp7_);
-#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	selected_action = _tmp8_;
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = selected_action;
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_ == GDK_ACTION_ASK) {
-#line 6039 "LibraryWindow.c"
+#line 6139 "LibraryWindow.c"
 		GtkResponseType _result_ = 0;
 		GSList* _tmp10_ = NULL;
 		GtkResponseType _tmp18_ = 0;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_result_ = GTK_RESPONSE_REJECT;
-#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = uris;
-#line 6047 "LibraryWindow.c"
+#line 6147 "LibraryWindow.c"
 		{
 			GSList* uri_collection = NULL;
 			GSList* uri_it = NULL;
-#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri_collection = _tmp10_;
-#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 6055 "LibraryWindow.c"
+#line 6155 "LibraryWindow.c"
 				gchar* _tmp11_ = NULL;
 				gchar* uri = NULL;
-#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp11_ = g_strdup ((const gchar*) uri_it->data);
-#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uri = _tmp11_;
-#line 6062 "LibraryWindow.c"
+#line 6162 "LibraryWindow.c"
 				{
 					const gchar* _tmp12_ = NULL;
 					GFile* _tmp13_ = NULL;
 					GFile* _tmp14_ = NULL;
 					gboolean _tmp15_ = FALSE;
 					gboolean _tmp16_ = FALSE;
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp12_ = uri;
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp13_ = g_file_new_for_uri (_tmp12_);
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp14_ = _tmp13_;
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp15_ = app_dirs_is_in_import_dir (_tmp14_);
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp16_ = !_tmp15_;
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_object_unref0 (_tmp14_);
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					if (_tmp16_) {
-#line 6083 "LibraryWindow.c"
+#line 6183 "LibraryWindow.c"
 						GtkResponseType _tmp17_ = 0;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_tmp17_ = copy_files_dialog ();
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_result_ = _tmp17_;
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_g_free0 (uri);
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						break;
-#line 6093 "LibraryWindow.c"
+#line 6193 "LibraryWindow.c"
 					}
-#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
-#line 6097 "LibraryWindow.c"
+#line 6197 "LibraryWindow.c"
 				}
 			}
 		}
-#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = _result_;
-#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		switch (_tmp18_) {
-#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_ACCEPT:
-#line 6107 "LibraryWindow.c"
+#line 6207 "LibraryWindow.c"
 			{
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_COPY;
-#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 6113 "LibraryWindow.c"
+#line 6213 "LibraryWindow.c"
 			}
-#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_REJECT:
-#line 6117 "LibraryWindow.c"
+#line 6217 "LibraryWindow.c"
 			{
-#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_LINK;
-#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 6123 "LibraryWindow.c"
+#line 6223 "LibraryWindow.c"
 			}
 			default:
 			{
 				GdkDragContext* _tmp19_ = NULL;
 				guint _tmp20_ = 0U;
-#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = context;
-#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp20_ = time;
-#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				gtk_drag_finish (_tmp19_, FALSE, FALSE, (guint32) _tmp20_);
-#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				__g_slist_free__g_free0_0 (uris);
-#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return;
-#line 6141 "LibraryWindow.c"
+#line 6241 "LibraryWindow.c"
 			}
 		}
 	}
-#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = uris;
-#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = selected_action;
-#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_dispatch_import_jobs (self, _tmp21_, "drag-and-drop", _tmp22_ == GDK_ACTION_COPY);
-#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = context;
-#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = time;
-#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_drag_finish (_tmp23_, TRUE, FALSE, (guint32) _tmp24_);
-#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	__g_slist_free__g_free0_0 (uris);
-#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 6161 "LibraryWindow.c"
+#line 6261 "LibraryWindow.c"
 }
 
 
@@ -6168,23 +6268,23 @@ void library_window_switch_to_library_page (LibraryWindow* self) {
 	LibraryPhotosEntry* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_photos_entry (_tmp0_);
-#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp4_);
-#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6187 "LibraryWindow.c"
+#line 6287 "LibraryWindow.c"
 }
 
 
@@ -6194,41 +6294,41 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) {
 	Event* _tmp1_ = NULL;
 	EventsEventEntry* _tmp2_ = NULL;
 	EventsEventEntry* _tmp3_ = NULL;
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->events_branch;
-#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = event;
-#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_);
-#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6213 "LibraryWindow.c"
+#line 6313 "LibraryWindow.c"
 		EventsEventEntry* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		Page* _tmp6_ = NULL;
-#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp6_);
-#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6227 "LibraryWindow.c"
+#line 6327 "LibraryWindow.c"
 	}
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6231 "LibraryWindow.c"
+#line 6331 "LibraryWindow.c"
 }
 
 
@@ -6238,41 +6338,41 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) {
 	Tag* _tmp1_ = NULL;
 	TagsSidebarEntry* _tmp2_ = NULL;
 	TagsSidebarEntry* _tmp3_ = NULL;
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_TAG (tag));
-#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->tags_branch;
-#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = tag;
-#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_);
-#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 908 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 908 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6257 "LibraryWindow.c"
+#line 6357 "LibraryWindow.c"
 		TagsSidebarEntry* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		Page* _tmp6_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp6_);
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6271 "LibraryWindow.c"
+#line 6371 "LibraryWindow.c"
 	}
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6275 "LibraryWindow.c"
+#line 6375 "LibraryWindow.c"
 }
 
 
@@ -6282,41 +6382,41 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se
 	SavedSearch* _tmp1_ = NULL;
 	SearchesSidebarEntry* _tmp2_ = NULL;
 	SearchesSidebarEntry* _tmp3_ = NULL;
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->saved_search_branch;
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = search;
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_);
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6301 "LibraryWindow.c"
+#line 6401 "LibraryWindow.c"
 		SearchesSidebarEntry* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		Page* _tmp6_ = NULL;
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp6_);
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6315 "LibraryWindow.c"
+#line 6415 "LibraryWindow.c"
 	}
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6319 "LibraryWindow.c"
+#line 6419 "LibraryWindow.c"
 }
 
 
@@ -6332,66 +6432,66 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c
 	CollectionPage* _tmp10_ = NULL;
 	Photo* _tmp11_ = NULL;
 	LibraryPhotoPage* _tmp12_ = NULL;
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (controller));
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PHOTO (current));
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = controller;
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = current;
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view_collection_get_view_for_source (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource));
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp5_ != NULL, "controller.get_view().get_view_for_source(current) != null");
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 920 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->photo_page;
-#line 920 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ == NULL) {
-#line 6363 "LibraryWindow.c"
+#line 6463 "LibraryWindow.c"
 		LibraryPhotoPage* _tmp7_ = NULL;
 		LibraryPhotoPage* _tmp8_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = library_photo_page_new ();
-#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_object_ref_sink (_tmp7_);
-#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (self->priv->photo_page);
-#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->photo_page = _tmp7_;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->photo_page;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
-#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		spin_event_loop ();
-#line 6380 "LibraryWindow.c"
+#line 6480 "LibraryWindow.c"
 	}
-#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->photo_page;
-#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = controller;
-#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = current;
-#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_photo_page_display_for_collection (_tmp9_, _tmp10_, _tmp11_, NULL);
-#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 933 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->photo_page;
-#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 933 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE, Page));
-#line 6394 "LibraryWindow.c"
+#line 6494 "LibraryWindow.c"
 }
 
 
@@ -6401,23 +6501,23 @@ void library_window_switch_to_import_queue_page (LibraryWindow* self) {
 	LibraryImportQueueSidebarEntry* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 933 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_import_queue_entry (_tmp0_);
-#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp4_);
-#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6420 "LibraryWindow.c"
+#line 6520 "LibraryWindow.c"
 }
 
 
@@ -6438,169 +6538,169 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 	gboolean _tmp13_ = FALSE;
 	GMount* _tmp14_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->camera_branch;
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = camera;
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = camera_branch_get_entry_for_camera (_tmp0_, _tmp1_);
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6461 "LibraryWindow.c"
+#line 6561 "LibraryWindow.c"
 	}
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = entry;
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_IMPORT_PAGE, ImportPage);
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = camera;
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_->uri;
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	uri_file = _tmp8_;
 #line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	uri_file = _tmp8_;
+#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 6479 "LibraryWindow.c"
+#line 6579 "LibraryWindow.c"
 	{
 		GMount* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
 		GMount* _tmp11_ = NULL;
 		GMount* _tmp12_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = uri_file;
-#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_);
-#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp11_;
-#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6493 "LibraryWindow.c"
+#line 6593 "LibraryWindow.c"
 			goto __catch39_g_error;
 		}
-#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp9_;
-#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		mount = _tmp12_;
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp9_);
-#line 6506 "LibraryWindow.c"
+#line 6606 "LibraryWindow.c"
 	}
 	goto __finally39;
 	__catch39_g_error:
 	{
 		GError* err = NULL;
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_inner_error_ = NULL;
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
-#line 6518 "LibraryWindow.c"
+#line 6618 "LibraryWindow.c"
 	}
 	__finally39:
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (page);
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_critical ("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 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6537 "LibraryWindow.c"
+#line 6637 "LibraryWindow.c"
 	}
-#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = mount;
-#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp14_ != NULL) {
-#line 6543 "LibraryWindow.c"
+#line 6643 "LibraryWindow.c"
 		DiscoveredCamera* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		gboolean _tmp17_ = FALSE;
-#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = camera;
-#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_->uri;
-#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = g_str_has_prefix (_tmp16_, "file://");
-#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = !_tmp17_;
-#line 6555 "LibraryWindow.c"
+#line 6655 "LibraryWindow.c"
 	} else {
-#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = FALSE;
-#line 6559 "LibraryWindow.c"
+#line 6659 "LibraryWindow.c"
 	}
-#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 6563 "LibraryWindow.c"
+#line 6663 "LibraryWindow.c"
 		ImportPage* _tmp18_ = NULL;
 		GMount* _tmp19_ = NULL;
 		gboolean _tmp20_ = FALSE;
-#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = page;
-#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = mount;
-#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = import_page_unmount_camera (_tmp18_, _tmp19_);
-#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp20_) {
-#line 6575 "LibraryWindow.c"
+#line 6675 "LibraryWindow.c"
 			ImportPage* _tmp21_ = NULL;
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = page;
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PAGE, Page));
-#line 6581 "LibraryWindow.c"
+#line 6681 "LibraryWindow.c"
 		} else {
-#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 961 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			app_window_error_message ("Unable to unmount the camera at this time.", NULL);
-#line 6585 "LibraryWindow.c"
+#line 6685 "LibraryWindow.c"
 		}
 	} else {
 		ImportPage* _tmp22_ = NULL;
-#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp22_ = page;
-#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE, Page));
-#line 6593 "LibraryWindow.c"
+#line 6693 "LibraryWindow.c"
 	}
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page);
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6603 "LibraryWindow.c"
+#line 6703 "LibraryWindow.c"
 }
 
 
@@ -6609,25 +6709,25 @@ void library_window_add_to_stack (LibraryWindow* self, Page* page) {
 	GtkStack* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
 	GtkStack* _tmp3_ = NULL;
-#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 968 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 968 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->stack;
-#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page;
-#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->stack;
-#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 6630 "LibraryWindow.c"
+#line 6730 "LibraryWindow.c"
 }
 
 
@@ -6635,49 +6735,49 @@ static void library_window_remove_from_stack (LibraryWindow* self, Page* page) {
 	GtkStack* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
 	GtkStack* _tmp2_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 977 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 977 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 975 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->stack;
-#line 975 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 975 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
 #line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
+#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->stack;
-#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 6652 "LibraryWindow.c"
+#line 6752 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new6 (gboolean value) {
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+static GVariant* _variant_new10 (gboolean value) {
+#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6659 "LibraryWindow.c"
+#line 6759 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new7 (gboolean value) {
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+static GVariant* _variant_new11 (gboolean value) {
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6666 "LibraryWindow.c"
+#line 6766 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new8 (gboolean value) {
-#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+static GVariant* _variant_new12 (gboolean value) {
+#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6673 "LibraryWindow.c"
+#line 6773 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new9 (const gchar* value) {
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+static GVariant* _variant_new13 (const gchar* value) {
+#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 6680 "LibraryWindow.c"
+#line 6780 "LibraryWindow.c"
 }
 
 
@@ -6722,148 +6822,148 @@ static void library_window_load_configuration (LibraryWindow* self) {
 	gchar* _tmp32_ = NULL;
 	GAction* _tmp33_ = NULL;
 	GVariant* _tmp34_ = NULL;
-#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayBasicProperties");
-#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	basic_display_action = _tmp1_;
-#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = basic_display_action;
-#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp2_ != NULL, "basic_display_action != null");
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = basic_display_action;
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = configuration_facade_get_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = _variant_new6 (_tmp6_);
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp7_ = _variant_new10 (_tmp6_);
+#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp3_, _tmp7_);
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp7_);
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties");
-#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	extended_display_action = _tmp9_;
-#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = extended_display_action;
-#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp10_ != NULL, "extended_display_action != null");
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = extended_display_action;
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = config_facade_get_instance ();
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = _tmp12_;
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = _variant_new7 (_tmp14_);
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp15_ = _variant_new11 (_tmp14_);
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp11_, _tmp15_);
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp15_);
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp13_);
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = _g_object_ref0 (_tmp16_);
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_bar_display_action = _tmp17_;
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = search_bar_display_action;
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp18_ != NULL, "search_bar_display_action != null");
-#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = search_bar_display_action;
-#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = config_facade_get_instance ();
-#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = _tmp20_;
-#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp23_ = _variant_new8 (_tmp22_);
-#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp23_ = _variant_new12 (_tmp22_);
+#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp19_, _tmp23_);
-#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp23_);
-#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp21_);
-#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents");
-#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sort_events_action = _tmp25_;
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = sort_events_action;
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp26_ != NULL, "sort_events_action != null");
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = config_facade_get_instance ();
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = _tmp28_;
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = _tmp30_;
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp29_);
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp31_) {
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING;
-#line 6829 "LibraryWindow.c"
+#line 6929 "LibraryWindow.c"
 	} else {
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
-#line 6833 "LibraryWindow.c"
+#line 6933 "LibraryWindow.c"
 	}
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = g_strdup (_tmp27_);
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	event_sort_val = _tmp32_;
 #line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	event_sort_val = _tmp32_;
+#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = sort_events_action;
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_ = _variant_new9 (event_sort_val);
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp34_ = _variant_new13 (event_sort_val);
+#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp33_, _tmp34_);
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp34_);
-#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (event_sort_val);
-#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (sort_events_action);
-#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (search_bar_display_action);
-#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (extended_display_action);
-#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_display_action);
-#line 6857 "LibraryWindow.c"
+#line 6957 "LibraryWindow.c"
 }
 
 
 static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (gpointer self) {
 	gboolean result;
 	result = library_window_on_pulse_background_progress_bar ((LibraryWindow*) self);
-#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 6866 "LibraryWindow.c"
+#line 6966 "LibraryWindow.c"
 }
 
 
@@ -6876,62 +6976,62 @@ static void library_window_start_pulse_background_progress_bar (LibraryWindow* s
 	const gchar* _tmp5_ = NULL;
 	GtkProgressBar* _tmp6_ = NULL;
 	guint _tmp7_ = 0U;
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (label != NULL);
-#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6891 "LibraryWindow.c"
+#line 6991 "LibraryWindow.c"
 	}
-#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = priority;
-#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = _tmp3_;
-#line 1015 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1015 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = label;
-#line 1015 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp4_, _tmp5_);
-#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->background_progress_bar;
-#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_pulse (_tmp6_);
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
-#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC, _library_window_on_pulse_background_progress_bar_gsource_func, g_object_ref (self), g_object_unref);
-#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = _tmp7_;
-#line 6917 "LibraryWindow.c"
+#line 7017 "LibraryWindow.c"
 }
 
 
 static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self) {
 	gboolean result = FALSE;
 	GtkProgressBar* _tmp0_ = NULL;
-#line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_bar;
-#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_pulse (_tmp0_);
-#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = TRUE;
-#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 6934 "LibraryWindow.c"
+#line 7034 "LibraryWindow.c"
 }
 
 
@@ -6940,43 +7040,43 @@ static void library_window_stop_pulse_background_progress_bar (LibraryWindow* se
 	gint _tmp1_ = 0;
 	guint _tmp2_ = 0U;
 	gboolean _tmp4_ = FALSE;
-#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1030 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1030 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1030 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1034 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6953 "LibraryWindow.c"
+#line 7053 "LibraryWindow.c"
 	}
-#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1036 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_pulse_id;
-#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1036 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != ((guint) 0)) {
-#line 6959 "LibraryWindow.c"
+#line 7059 "LibraryWindow.c"
 		guint _tmp3_ = 0U;
-#line 1034 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->background_progress_pulse_id;
-#line 1034 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_source_remove (_tmp3_);
-#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_pulse_id = (guint) 0;
-#line 6967 "LibraryWindow.c"
+#line 7067 "LibraryWindow.c"
 	}
-#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = clear;
-#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 6973 "LibraryWindow.c"
+#line 7073 "LibraryWindow.c"
 		gint _tmp5_ = 0;
-#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = priority;
-#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, _tmp5_);
-#line 6979 "LibraryWindow.c"
+#line 7079 "LibraryWindow.c"
 	}
 }
 
@@ -7000,102 +7100,102 @@ static void library_window_update_background_progress_bar (LibraryWindow* self,
 	gdouble _tmp18_ = 0.0;
 	gchar* _tmp19_ = NULL;
 	gchar* _tmp20_ = NULL;
-#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (label != NULL);
-#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7015 "LibraryWindow.c"
+#line 7115 "LibraryWindow.c"
 	}
-#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = count;
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ <= 0.0) {
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = TRUE;
-#line 7027 "LibraryWindow.c"
+#line 7127 "LibraryWindow.c"
 	} else {
 		gdouble _tmp6_ = 0.0;
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = total;
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp6_ <= 0.0;
-#line 7034 "LibraryWindow.c"
+#line 7134 "LibraryWindow.c"
 	}
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = TRUE;
-#line 7040 "LibraryWindow.c"
+#line 7140 "LibraryWindow.c"
 	} else {
 		gdouble _tmp7_ = 0.0;
 		gdouble _tmp8_ = 0.0;
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = count;
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = total;
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = _tmp7_ >= _tmp8_;
-#line 7050 "LibraryWindow.c"
+#line 7150 "LibraryWindow.c"
 	}
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 7054 "LibraryWindow.c"
+#line 7154 "LibraryWindow.c"
 		gint _tmp9_ = 0;
-#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = priority;
-#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, _tmp9_);
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7062 "LibraryWindow.c"
+#line 7162 "LibraryWindow.c"
 	}
-#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = priority;
-#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = _tmp10_;
-#line 1057 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = count;
-#line 1057 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = total;
-#line 1057 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	fraction = _tmp11_ / _tmp12_;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->background_progress_bar;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = fraction;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_fraction (_tmp13_, _tmp14_);
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->background_progress_bar;
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = _ ("%s (%d%%)");
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = label;
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = fraction;
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = g_strdup_printf (_tmp16_, _tmp17_, (gint) (_tmp18_ * 100.0));
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = _tmp19_;
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp15_, _tmp20_);
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp20_);
-#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
-#line 7098 "LibraryWindow.c"
+#line 7198 "LibraryWindow.c"
 }
 
 
@@ -7105,149 +7205,149 @@ static void library_window_clear_background_progress_bar (LibraryWindow* self, g
 	gint _tmp2_ = 0;
 	GtkProgressBar* _tmp3_ = NULL;
 	GtkProgressBar* _tmp4_ = NULL;
-#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1072 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7118 "LibraryWindow.c"
+#line 7218 "LibraryWindow.c"
 	}
-#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = 0;
-#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->background_progress_bar;
-#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_fraction (_tmp3_, 0.0);
-#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1081 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1081 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp4_, "");
-#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_background_progress_bar (self);
-#line 7136 "LibraryWindow.c"
+#line 7236 "LibraryWindow.c"
 }
 
 
 static void library_window_show_background_progress_bar (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1090 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
-#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp0_) {
-#line 7148 "LibraryWindow.c"
+#line 7248 "LibraryWindow.c"
 		GtkBox* _tmp1_ = NULL;
 		GtkFrame* _tmp2_ = NULL;
 		GtkFrame* _tmp3_ = NULL;
-#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1092 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
-#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1092 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = self->priv->background_progress_frame;
-#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1092 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_box_pack_end (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1090 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->background_progress_frame;
-#line 1090 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = TRUE;
-#line 7164 "LibraryWindow.c"
+#line 7264 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_hide_background_progress_bar (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
-#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 7177 "LibraryWindow.c"
+#line 7277 "LibraryWindow.c"
 		GtkBox* _tmp1_ = NULL;
 		GtkFrame* _tmp2_ = NULL;
-#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
-#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = self->priv->background_progress_frame;
-#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = FALSE;
-#line 7188 "LibraryWindow.c"
+#line 7288 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_on_library_monitor_discovery_started (LibraryWindow* self) {
 	const gchar* _tmp0_ = NULL;
-#line 1102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = _ ("Updating library…");
-#line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY);
-#line 7201 "LibraryWindow.c"
+#line 7301 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self) {
-#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY, TRUE);
-#line 7210 "LibraryWindow.c"
+#line 7310 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files) {
 	gint _tmp0_ = 0;
-#line 1110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = total_files;
-#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) {
-#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY);
-#line 7224 "LibraryWindow.c"
+#line 7324 "LibraryWindow.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
-#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _ ("Updating library…");
-#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = completed_files;
-#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = total_files;
-#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_update_background_progress_bar (self, _tmp1_, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) _tmp2_, (gdouble) _tmp3_);
-#line 7237 "LibraryWindow.c"
+#line 7337 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) {
 	const gchar* _tmp0_ = NULL;
-#line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = _ ("Preparing to auto-import photos…");
-#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY);
-#line 7250 "LibraryWindow.c"
+#line 7350 "LibraryWindow.c"
 }
 
 
@@ -7255,44 +7355,44 @@ static void library_window_on_library_monitor_auto_import_progress (LibraryWindo
 	const gchar* _tmp0_ = NULL;
 	guint64 _tmp1_ = 0ULL;
 	guint64 _tmp2_ = 0ULL;
-#line 1124 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = _ ("Auto-importing photos…");
-#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = completed_bytes;
-#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = total_bytes;
-#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_update_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 7268 "LibraryWindow.c"
+#line 7368 "LibraryWindow.c"
 }
 
 
 static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total) {
 	guint _tmp0_ = 0U;
-#line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = total;
-#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) {
-#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY);
-#line 7282 "LibraryWindow.c"
+#line 7382 "LibraryWindow.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 		guint _tmp3_ = 0U;
-#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _ ("Writing metadata to files…");
-#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = completed;
-#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = total;
-#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_update_background_progress_bar (self, _tmp1_, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) _tmp2_, (gdouble) _tmp3_);
-#line 7295 "LibraryWindow.c"
+#line 7395 "LibraryWindow.c"
 	}
 }
 
@@ -7329,232 +7429,253 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page)
 	SearchFilterToolbar* _tmp27_ = NULL;
 	GtkBox* _tmp28_ = NULL;
 	GtkStack* _tmp29_ = NULL;
-	GtkPaned* _tmp30_ = NULL;
-	GtkPaned* _tmp31_ = NULL;
+	GtkBox* _tmp30_ = NULL;
+	GtkRevealer* _tmp31_ = NULL;
 	GtkPaned* _tmp32_ = NULL;
-	SidebarTree* _tmp33_ = NULL;
+	GtkPaned* _tmp33_ = NULL;
 	GtkPaned* _tmp34_ = NULL;
-	GtkBox* _tmp35_ = NULL;
+	SidebarTree* _tmp35_ = NULL;
 	GtkPaned* _tmp36_ = NULL;
-	ConfigFacade* _tmp37_ = NULL;
-	ConfigFacade* _tmp38_ = NULL;
-	gint _tmp39_ = 0;
-	GtkStack* _tmp40_ = NULL;
+	GtkBox* _tmp37_ = NULL;
+	GtkPaned* _tmp38_ = NULL;
+	ConfigFacade* _tmp39_ = NULL;
+	ConfigFacade* _tmp40_ = NULL;
 	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	GtkBox* _tmp43_ = NULL;
-	GtkPaned* _tmp44_ = NULL;
+	GtkStack* _tmp42_ = NULL;
+	gint _tmp43_ = 0;
+	gint _tmp44_ = 0;
 	GtkBox* _tmp45_ = NULL;
-	Page* _tmp46_ = NULL;
-	Page* _tmp47_ = NULL;
-#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	GtkPaned* _tmp46_ = NULL;
+	GtkBox* _tmp47_ = NULL;
+	GtkBuilder* builder = NULL;
+	GtkBuilder* _tmp48_ = NULL;
+	GObject* _tmp49_ = NULL;
+	Page* _tmp50_ = NULL;
+	Page* _tmp51_ = NULL;
+#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_PAGE (start_page));
 #line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_PAGE (start_page));
+#line 1144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL);
-#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	scrolled_sidebar = _tmp0_;
-#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_scrolled_window_set_policy (scrolled_sidebar, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-#line 1143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->sidebar_tree;
-#line 1143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1148 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_frame;
-#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1148 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), (guint) 2);
-#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->background_progress_frame;
-#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->background_progress_frame;
-#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_style_context_remove_class (_tmp6_, "frame");
 #line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_style_context_remove_class (_tmp6_, "frame");
+#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = self->priv->basic_properties;
-#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
-#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->basic_properties;
-#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->basic_properties;
-#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->basic_properties;
-#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = self->priv->basic_properties;
-#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 10);
-#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->basic_properties;
-#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 10);
-#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->basic_properties;
-#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 6);
-#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = self->priv->basic_properties;
-#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), 0);
-#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->bottom_frame;
-#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->basic_properties;
-#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
-#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = self->priv->bottom_frame;
-#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
-#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_style_context_remove_class (_tmp18_, "frame");
-#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = self->priv->top_section;
-#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = self->priv->sidebar_paned;
-#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = self->priv->top_section;
-#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_pack1 (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
-#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = self->priv->sidebar_paned;
-#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->bottom_frame;
-#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_pack2 (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
-#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = self->priv->sidebar_paned;
-#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_set_position (_tmp24_, 1000);
-#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp25_);
-#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->right_vbox);
-#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->right_vbox = _tmp25_;
-#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp26_ = self->priv->right_vbox;
-#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp27_ = self->priv->search_toolbar;
-#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp28_ = self->priv->right_vbox;
-#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp29_ = self->priv->stack;
-#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp30_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_object_ref_sink (_tmp30_);
+	_tmp26_ = self->priv->right_vbox;
 #line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->client_paned);
+	_tmp27_ = self->priv->search_toolbar;
 #line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->client_paned = _tmp30_;
+	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_ = self->priv->client_paned;
+	_tmp28_ = self->priv->right_vbox;
 #line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp32_ = self->priv->sidebar_paned;
+	_tmp29_ = self->priv->stack;
 #line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_pack1 (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
+	gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp33_ = self->priv->sidebar_tree;
+	_tmp30_ = self->priv->right_vbox;
 #line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH, -1);
-#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_ = self->priv->client_paned;
-#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp35_ = self->priv->right_vbox;
-#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_pack2 (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
-#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp36_ = self->priv->client_paned;
+	_tmp31_ = self->priv->toolbar_revealer;
+#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
 #line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp37_ = config_facade_get_instance ();
+	_tmp32_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 #line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp38_ = _tmp37_;
+	g_object_ref_sink (_tmp32_);
 #line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp39_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_set_position (_tmp36_, _tmp39_);
+	_g_object_unref0 (self->priv->client_paned);
 #line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp38_);
-#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp40_ = self->priv->stack;
-#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp41_ = library_window_get_PAGE_MIN_WIDTH ();
+	self->priv->client_paned = _tmp32_;
+#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp33_ = self->priv->client_paned;
+#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp34_ = self->priv->sidebar_paned;
+#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_paned_pack1 (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
 #line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp42_ = _tmp41_;
+	_tmp35_ = self->priv->sidebar_tree;
 #line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), _tmp42_, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH, -1);
+#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp36_ = self->priv->client_paned;
+#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp37_ = self->priv->right_vbox;
+#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_paned_pack2 (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp38_ = self->priv->client_paned;
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp39_ = config_facade_get_instance ();
 #line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp43_ = self->priv->layout;
+	_tmp40_ = _tmp39_;
 #line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp44_ = self->priv->client_paned;
+	_tmp41_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_box_pack_end (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_paned_set_position (_tmp38_, _tmp41_);
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp40_);
 #line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp45_ = self->priv->layout;
+	_tmp42_ = self->priv->stack;
 #line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
+	_tmp43_ = library_window_get_PAGE_MIN_WIDTH ();
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp44_ = _tmp43_;
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), _tmp44_, -1);
+#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp45_ = self->priv->layout;
 #line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp46_ = start_page;
+	_tmp46_ = self->priv->client_paned;
 #line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_switch_to_page (self, _tmp46_);
-#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp47_ = start_page;
-#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget));
-#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_box_pack_end (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp47_ = self->priv->layout;
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget));
+#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp48_ = gtk_builder_new_from_resource ("/org/gnome/Shotwell/appmenu.ui");
+#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	builder = _tmp48_;
+#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp49_ = gtk_builder_get_object (builder, "appmenu");
+#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	application_set_appmenu (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, g_menu_get_type ()) ? ((GMenu*) _tmp49_) : NULL, g_menu_model_get_type (), GMenuModel));
+#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp50_ = start_page;
+#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_switch_to_page (self, _tmp50_);
+#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp51_ = start_page;
+#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget));
+#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (builder);
+#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (scrolled_sidebar);
-#line 7530 "LibraryWindow.c"
+#line 7651 "LibraryWindow.c"
 }
 
 
 static void library_window_real_set_current_page (PageWindow* base, Page* page) {
 	LibraryWindow * self;
 	Page* _tmp0_ = NULL;
-#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp0_);
-#line 7545 "LibraryWindow.c"
+#line 7666 "LibraryWindow.c"
 }
 
 
 void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable) {
 	gboolean _tmp0_ = FALSE;
-#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = should_enable;
-#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = _tmp0_;
-#line 7557 "LibraryWindow.c"
+#line 7678 "LibraryWindow.c"
 }
 
 
@@ -7591,43 +7712,43 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	GtkToolbar* _tmp47_ = NULL;
 	GtkToolbar* _tmp48_ = NULL;
 	Page* _tmp54_ = NULL;
-#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->page_switching_enabled;
-#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp0_) {
-#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7604 "LibraryWindow.c"
+#line 7725 "LibraryWindow.c"
 	}
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp1_ == _tmp3_;
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7620 "LibraryWindow.c"
+#line 7741 "LibraryWindow.c"
 	}
-#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	current_page = _tmp5_;
-#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = current_page;
-#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 7630 "LibraryWindow.c"
+#line 7751 "LibraryWindow.c"
 		GtkToolbar* toolbar = NULL;
 		Page* _tmp7_ = NULL;
 		GtkToolbar* _tmp8_ = NULL;
@@ -7635,96 +7756,96 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		Page* _tmp12_ = NULL;
 		Page* _tmp13_ = NULL;
 		Page* _tmp15_ = NULL;
-#line 1208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE);
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		application_set_menubar (NULL);
-#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = current_page;
-#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page_get_toolbar (_tmp7_);
-#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		toolbar = _tmp8_;
-#line 1212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = toolbar;
-#line 1212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp9_ != NULL) {
-#line 7652 "LibraryWindow.c"
-			GtkBox* _tmp10_ = NULL;
+#line 7773 "LibraryWindow.c"
+			GtkRevealer* _tmp10_ = NULL;
 			GtkToolbar* _tmp11_ = NULL;
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp10_ = self->priv->right_vbox;
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp10_ = self->priv->toolbar_revealer;
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp11_ = toolbar;
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 7661 "LibraryWindow.c"
+#line 7782 "LibraryWindow.c"
 		}
-#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = current_page;
-#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		page_switching_from (_tmp12_);
-#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = current_page;
-#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7671 "LibraryWindow.c"
+#line 7792 "LibraryWindow.c"
 			SidebarTree* _tmp14_ = NULL;
-#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = self->priv->sidebar_tree;
-#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_enable_editing (_tmp14_);
-#line 7677 "LibraryWindow.c"
+#line 7798 "LibraryWindow.c"
 		}
-#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = current_page;
-#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_unsubscribe_from_basic_information (self, _tmp15_);
-#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (toolbar);
-#line 7685 "LibraryWindow.c"
+#line 7806 "LibraryWindow.c"
 	}
-#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->stack;
-#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = page;
-#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_stack_set_visible_child (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
-#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = page;
-#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_WINDOW_CLASS (library_window_parent_class)->set_current_page (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp18_);
-#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = page;
-#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7701 "LibraryWindow.c"
+#line 7822 "LibraryWindow.c"
 		SidebarTree* _tmp20_ = NULL;
-#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = self->priv->sidebar_tree;
-#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_disable_editing (_tmp20_);
-#line 7707 "LibraryWindow.c"
+#line 7828 "LibraryWindow.c"
 	}
-#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = library_window_should_show_search_bar (self);
-#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = page;
-#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_toggle_search_bar (self, _tmp21_, G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp22_) : NULL);
-#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->page_map;
-#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = page;
-#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_);
-#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = (SidebarEntry*) _tmp25_;
-#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = entry;
-#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp26_ != NULL) {
-#line 7727 "LibraryWindow.c"
+#line 7848 "LibraryWindow.c"
 		SidebarExpandableEntry* expandable_entry = NULL;
 		SidebarEntry* _tmp27_ = NULL;
 		SidebarExpandableEntry* _tmp28_ = NULL;
@@ -7732,141 +7853,141 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		SidebarExpandableEntry* _tmp30_ = NULL;
 		SidebarTree* _tmp35_ = NULL;
 		SidebarEntry* _tmp36_ = NULL;
-#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = entry;
-#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_EXPANDABLE_ENTRY) ? ((SidebarExpandableEntry*) _tmp27_) : NULL);
-#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		expandable_entry = _tmp28_;
-#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp30_ = expandable_entry;
-#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp30_ != NULL) {
-#line 7745 "LibraryWindow.c"
+#line 7866 "LibraryWindow.c"
 			SidebarExpandableEntry* _tmp31_ = NULL;
 			gboolean _tmp32_ = FALSE;
-#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp31_ = expandable_entry;
-#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp32_ = sidebar_expandable_entry_expand_on_select (_tmp31_);
-#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp29_ = _tmp32_;
-#line 7754 "LibraryWindow.c"
+#line 7875 "LibraryWindow.c"
 		} else {
-#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp29_ = FALSE;
-#line 7758 "LibraryWindow.c"
+#line 7879 "LibraryWindow.c"
 		}
-#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp29_) {
-#line 7762 "LibraryWindow.c"
+#line 7883 "LibraryWindow.c"
 			SidebarTree* _tmp33_ = NULL;
 			SidebarEntry* _tmp34_ = NULL;
-#line 1249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp33_ = self->priv->sidebar_tree;
-#line 1249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp34_ = entry;
-#line 1249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_expand_to_entry (_tmp33_, _tmp34_);
-#line 7771 "LibraryWindow.c"
+#line 7892 "LibraryWindow.c"
 		}
-#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp35_ = self->priv->sidebar_tree;
-#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = entry;
-#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_place_cursor (_tmp35_, _tmp36_, TRUE);
-#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (expandable_entry);
-#line 7781 "LibraryWindow.c"
+#line 7902 "LibraryWindow.c"
 	}
-#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties (self);
-#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = page;
-#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_CHECKERBOARD_PAGE)) {
-#line 7789 "LibraryWindow.c"
+#line 7910 "LibraryWindow.c"
 		Page* _tmp38_ = NULL;
-#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp38_ = page;
-#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_init_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 7795 "LibraryWindow.c"
+#line 7916 "LibraryWindow.c"
 	}
-#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp39_ = page;
-#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
-#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = _tmp40_;
-#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_subscribe_for_basic_information (self, _tmp41_);
-#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp41_);
-#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = page;
-#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_switched_to (_tmp42_);
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = page;
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = page_get_menubar (_tmp43_);
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp45_ = _tmp44_;
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	application_set_menubar (_tmp45_);
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp45_);
-#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE);
-#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp46_ = page;
-#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp47_ = page_get_toolbar (_tmp46_);
-#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	toolbar = _tmp47_;
-#line 1270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp48_ = toolbar;
-#line 1270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp48_ != NULL) {
-#line 7835 "LibraryWindow.c"
-		GtkBox* _tmp49_ = NULL;
+#line 7956 "LibraryWindow.c"
+		GtkRevealer* _tmp49_ = NULL;
 		GtkToolbar* _tmp50_ = NULL;
 		GtkToolbar* _tmp51_ = NULL;
-		GtkToolbar* _tmp52_ = NULL;
+		GtkRevealer* _tmp52_ = NULL;
 		gboolean _tmp53_ = FALSE;
-#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp49_ = self->priv->right_vbox;
-#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp49_ = self->priv->toolbar_revealer;
+#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp50_ = toolbar;
-#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget));
-#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp51_ = toolbar;
-#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget));
-#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp52_ = toolbar;
-#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp52_ = self->priv->toolbar_revealer;
+#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp53_ = library_window_is_toolbar_visible (self);
-#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), _tmp53_);
-#line 7857 "LibraryWindow.c"
+#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_revealer_set_reveal_child (_tmp52_, _tmp53_);
+#line 7978 "LibraryWindow.c"
 	}
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp54_ = page;
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_ready (_tmp54_);
-#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
-#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 7869 "LibraryWindow.c"
+#line 7990 "LibraryWindow.c"
 }
 
 
@@ -7881,41 +8002,41 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa
 	CheckerboardPage* _tmp7_ = NULL;
 	SearchViewFilter* _tmp8_ = NULL;
 	SearchViewFilter* _tmp9_ = NULL;
-#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (page));
-#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
-#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = checkerboard_page_get_search_view_filter (_tmp1_);
-#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_toolbar_set_view_filter (_tmp0_, _tmp3_);
-#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_view_filter_unref0 (_tmp3_);
-#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = page;
-#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page));
-#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = page;
-#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = checkerboard_page_get_search_view_filter (_tmp7_);
-#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view_collection_install_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_view_filter_unref0 (_tmp9_);
-#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 7918 "LibraryWindow.c"
+#line 8039 "LibraryWindow.c"
 }
 
 
@@ -7925,35 +8046,35 @@ static gboolean library_window_should_show_search_bar (LibraryWindow* self) {
 	Page* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE);
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 7940 "LibraryWindow.c"
+#line 8061 "LibraryWindow.c"
 		gboolean _tmp4_ = FALSE;
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->is_search_toolbar_visible;
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 7946 "LibraryWindow.c"
+#line 8067 "LibraryWindow.c"
 	} else {
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 7950 "LibraryWindow.c"
+#line 8071 "LibraryWindow.c"
 	}
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 7956 "LibraryWindow.c"
+#line 8077 "LibraryWindow.c"
 }
 
 
@@ -7961,21 +8082,21 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 	SearchFilterToolbar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((page == NULL) || IS_CHECKERBOARD_PAGE (page));
-#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
-#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = show;
-#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_revealer_set_reveal_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_revealer_get_type (), GtkRevealer), _tmp1_);
-#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = show;
-#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 7978 "LibraryWindow.c"
+#line 8099 "LibraryWindow.c"
 		CheckerboardPage* _tmp3_ = NULL;
 		SearchFilterToolbar* _tmp4_ = NULL;
 		CheckerboardPage* _tmp5_ = NULL;
@@ -7987,70 +8108,70 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 		CheckerboardPage* _tmp11_ = NULL;
 		SearchViewFilter* _tmp12_ = NULL;
 		SearchViewFilter* _tmp13_ = NULL;
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = page;
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_assert (NULL != _tmp3_, "null != page");
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->search_toolbar;
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = page;
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = checkerboard_page_get_search_view_filter (_tmp5_);
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_toolbar_set_view_filter (_tmp4_, _tmp7_);
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_view_filter_unref0 (_tmp7_);
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page;
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = page;
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = checkerboard_page_get_search_view_filter (_tmp11_);
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		view_collection_install_view_filter (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_view_filter_unref0 (_tmp13_);
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 8024 "LibraryWindow.c"
+#line 8145 "LibraryWindow.c"
 	} else {
 		CheckerboardPage* _tmp14_ = NULL;
-#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = page;
-#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_ != NULL) {
-#line 8031 "LibraryWindow.c"
+#line 8152 "LibraryWindow.c"
 			CheckerboardPage* _tmp15_ = NULL;
 			ViewCollection* _tmp16_ = NULL;
 			ViewCollection* _tmp17_ = NULL;
 			DisabledViewFilter* _tmp18_ = NULL;
 			DisabledViewFilter* _tmp19_ = NULL;
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp15_ = page;
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE, Page));
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = _tmp16_;
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp18_ = disabled_view_filter_new ();
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp19_ = _tmp18_;
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			view_collection_install_view_filter (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_view_filter_unref0 (_tmp19_);
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_tmp17_);
-#line 8053 "LibraryWindow.c"
+#line 8174 "LibraryWindow.c"
 		}
 	}
 }
@@ -8064,33 +8185,33 @@ static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepr
 	Page* _tmp4_ = NULL;
 	SidebarPageRepresentative* _tmp5_ = NULL;
 	Page* _tmp6_ = NULL;
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->page_map;
-#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (!_tmp2_, "!page_map.has_key(page)");
-#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->page_map;
-#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = page;
-#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = entry;
-#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = page;
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_add_to_stack (self, _tmp6_);
-#line 8093 "LibraryWindow.c"
+#line 8214 "LibraryWindow.c"
 }
 
 
@@ -8104,61 +8225,61 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR
 	GeeHashMap* _tmp10_ = NULL;
 	Page* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp0_ == _tmp2_;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 8125 "LibraryWindow.c"
+#line 8246 "LibraryWindow.c"
 		LibraryBranch* _tmp4_ = NULL;
 		LibraryPhotosEntry* _tmp5_ = NULL;
 		LibraryPhotosEntry* _tmp6_ = NULL;
 		Page* _tmp7_ = NULL;
 		Page* _tmp8_ = NULL;
-#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->library_branch;
-#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = library_branch_get_photos_entry (_tmp4_);
-#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp8_);
-#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp8_);
-#line 8145 "LibraryWindow.c"
+#line 8266 "LibraryWindow.c"
 	}
-#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = page;
-#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_remove_from_stack (self, _tmp9_);
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->page_map;
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = page;
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL);
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	removed = _tmp12_;
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (removed, "removed");
-#line 8161 "LibraryWindow.c"
+#line 8282 "LibraryWindow.c"
 }
 
 
@@ -8167,39 +8288,39 @@ static void library_window_on_sidebar_entry_selected (LibraryWindow* self, Sideb
 	SidebarSelectableEntry* _tmp0_ = NULL;
 	SidebarPageRepresentative* _tmp1_ = NULL;
 	SidebarPageRepresentative* _tmp2_ = NULL;
-#line 1319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
-#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = selectable;
-#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp0_) : NULL);
-#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_rep = _tmp1_;
-#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_rep;
-#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 8184 "LibraryWindow.c"
+#line 8305 "LibraryWindow.c"
 		SidebarPageRepresentative* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = page_rep;
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = sidebar_page_representative_get_page (_tmp3_);
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp5_);
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 8198 "LibraryWindow.c"
+#line 8319 "LibraryWindow.c"
 	}
-#line 1319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page_rep);
-#line 8202 "LibraryWindow.c"
+#line 8323 "LibraryWindow.c"
 }
 
 
@@ -8220,207 +8341,207 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel
 	LibraryPhotosEntry* _tmp32_ = NULL;
 	Page* _tmp33_ = NULL;
 	Page* _tmp34_ = NULL;
-#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
-#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_last_imported_entry (_tmp0_);
-#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	last_import_entry = _tmp3_;
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = selectable;
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) {
-#line 8241 "LibraryWindow.c"
+#line 8362 "LibraryWindow.c"
 		LibraryLastImportSidebarEntry* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = last_import_entry;
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = library_hideable_page_entry_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry));
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp8_;
-#line 8253 "LibraryWindow.c"
+#line 8374 "LibraryWindow.c"
 	} else {
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = FALSE;
-#line 8257 "LibraryWindow.c"
+#line 8378 "LibraryWindow.c"
 	}
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 8261 "LibraryWindow.c"
+#line 8382 "LibraryWindow.c"
 		LibraryLastImportSidebarEntry* _tmp9_ = NULL;
 		Page* _tmp10_ = NULL;
 		Page* _tmp11_ = NULL;
-#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = last_import_entry;
-#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp11_);
-#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8279 "LibraryWindow.c"
+#line 8400 "LibraryWindow.c"
 	}
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = selectable;
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, EVENTS_TYPE_EVENT_ENTRY)) {
-#line 8285 "LibraryWindow.c"
+#line 8406 "LibraryWindow.c"
 		EventsBranch* _tmp14_ = NULL;
 		gboolean _tmp15_ = FALSE;
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = self->priv->events_branch;
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp15_;
-#line 8294 "LibraryWindow.c"
+#line 8415 "LibraryWindow.c"
 	} else {
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = FALSE;
-#line 8298 "LibraryWindow.c"
+#line 8419 "LibraryWindow.c"
 	}
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_) {
-#line 8302 "LibraryWindow.c"
+#line 8423 "LibraryWindow.c"
 		EventsBranch* _tmp16_ = NULL;
 		EventsMasterDirectoryEntry* _tmp17_ = NULL;
 		EventsMasterDirectoryEntry* _tmp18_ = NULL;
 		Page* _tmp19_ = NULL;
 		Page* _tmp20_ = NULL;
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = self->priv->events_branch;
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = events_branch_get_master_entry (_tmp16_);
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = _tmp17_;
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = _tmp19_;
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp20_);
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp20_);
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8328 "LibraryWindow.c"
+#line 8449 "LibraryWindow.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = selectable;
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, EVENTS_TYPE_DIRECTORY_ENTRY)) {
-#line 8334 "LibraryWindow.c"
+#line 8455 "LibraryWindow.c"
 		EventsBranch* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = self->priv->events_branch;
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = _tmp24_;
-#line 8343 "LibraryWindow.c"
+#line 8464 "LibraryWindow.c"
 	} else {
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = FALSE;
-#line 8347 "LibraryWindow.c"
+#line 8468 "LibraryWindow.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp21_) {
-#line 8351 "LibraryWindow.c"
+#line 8472 "LibraryWindow.c"
 		EventsBranch* _tmp25_ = NULL;
 		EventsMasterDirectoryEntry* _tmp26_ = NULL;
 		EventsMasterDirectoryEntry* _tmp27_ = NULL;
 		Page* _tmp28_ = NULL;
 		Page* _tmp29_ = NULL;
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp25_ = self->priv->events_branch;
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp26_ = events_branch_get_master_entry (_tmp25_);
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = _tmp26_;
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _tmp28_;
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp29_);
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp29_);
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp27_);
-#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8377 "LibraryWindow.c"
+#line 8498 "LibraryWindow.c"
 	}
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = self->priv->library_branch;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = library_branch_get_photos_entry (_tmp30_);
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = _tmp31_;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = _tmp33_;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp34_);
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp34_);
-#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (last_import_entry);
-#line 8395 "LibraryWindow.c"
+#line 8516 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8402 "LibraryWindow.c"
+#line 8523 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8409 "LibraryWindow.c"
+#line 8530 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8416 "LibraryWindow.c"
+#line 8537 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8423 "LibraryWindow.c"
+#line 8544 "LibraryWindow.c"
 }
 
 
@@ -8428,27 +8549,27 @@ static void library_window_subscribe_for_basic_information (LibraryWindow* self,
 	ViewCollection* view = NULL;
 	Page* _tmp0_ = NULL;
 	ViewCollection* _tmp1_ = NULL;
-#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (_tmp0_);
-#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (view, "items-state-changed", (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self, 0);
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_update_properties_data_collection_items_altered, self, 0);
-#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self, 0);
-#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (view, "items-visibility-changed", (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self, 0);
-#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 8451 "LibraryWindow.c"
+#line 8572 "LibraryWindow.c"
 }
 
 
@@ -8460,47 +8581,47 @@ static void library_window_unsubscribe_from_basic_information (LibraryWindow* se
 	guint _tmp3_ = 0U;
 	guint _tmp4_ = 0U;
 	guint _tmp5_ = 0U;
-#line 1365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (_tmp0_);
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE);
-#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self);
-#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_items_altered, self);
-#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
-#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self);
-#line 1371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE);
-#line 1371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self);
-#line 1365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 8491 "LibraryWindow.c"
+#line 8612 "LibraryWindow.c"
 }
 
 
 static void library_window_on_update_properties (LibraryWindow* self) {
 	OneShotScheduler* _tmp0_ = NULL;
-#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->properties_scheduler;
-#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	one_shot_scheduler_at_idle (_tmp0_);
-#line 8503 "LibraryWindow.c"
+#line 8624 "LibraryWindow.c"
 }
 
 
@@ -8511,55 +8632,55 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 	ExtendedPropertiesWindow* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->bottom_frame;
-#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 8524 "LibraryWindow.c"
+#line 8645 "LibraryWindow.c"
 		BasicProperties* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
-#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->basic_properties;
-#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
-#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 8538 "LibraryWindow.c"
+#line 8659 "LibraryWindow.c"
 	}
-#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->extended_properties;
-#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
-#line 8548 "LibraryWindow.c"
+#line 8669 "LibraryWindow.c"
 		ExtendedPropertiesWindow* _tmp9_ = NULL;
 		Page* _tmp10_ = NULL;
 		Page* _tmp11_ = NULL;
-#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->extended_properties;
-#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		extended_properties_window_update_properties (_tmp9_, _tmp11_);
-#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 8562 "LibraryWindow.c"
+#line 8683 "LibraryWindow.c"
 	}
 }
 
@@ -8567,13 +8688,13 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 8576 "LibraryWindow.c"
+#line 8697 "LibraryWindow.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -8586,100 +8707,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8607 "LibraryWindow.c"
+#line 8728 "LibraryWindow.c"
 				goto __catch41_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
-#line 8616 "LibraryWindow.c"
+#line 8737 "LibraryWindow.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8632 "LibraryWindow.c"
+#line 8753 "LibraryWindow.c"
 				goto __catch41_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
-#line 8643 "LibraryWindow.c"
+#line 8764 "LibraryWindow.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
-#line 8657 "LibraryWindow.c"
+#line 8778 "LibraryWindow.c"
 	}
 	goto __finally41;
 	__catch41_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 8671 "LibraryWindow.c"
+#line 8792 "LibraryWindow.c"
 	}
 	__finally41:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
-#line 8682 "LibraryWindow.c"
+#line 8803 "LibraryWindow.c"
 	}
 }
 
@@ -8697,66 +8818,66 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 	gboolean _tmp13_ = FALSE;
 	gboolean _tmp18_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (uri != NULL);
-#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = uri;
-#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:1387: mount point reported: %s", _tmp0_);
-#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:1394: mount point reported: %s", _tmp0_);
+#line 1397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = uri;
-#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = library_window_is_mount_uri_supported (_tmp1_);
-#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp2_) {
-#line 8714 "LibraryWindow.c"
+#line 8835 "LibraryWindow.c"
 		const gchar* _tmp3_ = NULL;
-#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = uri;
-#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:1391: Unsupported mount scheme: %s", _tmp3_);
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:1398: Unsupported mount scheme: %s", _tmp3_);
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8722 "LibraryWindow.c"
+#line 8843 "LibraryWindow.c"
 	}
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = uri;
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = g_file_new_for_uri (_tmp4_);
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uri_file = _tmp5_;
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 8732 "LibraryWindow.c"
+#line 8853 "LibraryWindow.c"
 	{
 		GMount* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
 		GMount* _tmp8_ = NULL;
 		GMount* _tmp9_ = NULL;
-#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = uri_file;
-#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = g_file_find_enclosing_mount (_tmp7_, NULL, &_inner_error_);
-#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp8_;
-#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8746 "LibraryWindow.c"
+#line 8867 "LibraryWindow.c"
 			goto __catch40_g_error;
 		}
-#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp6_;
-#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = NULL;
-#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		mount = _tmp9_;
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 8759 "LibraryWindow.c"
+#line 8880 "LibraryWindow.c"
 	}
 	goto __finally40;
 	__catch40_g_error:
@@ -8764,121 +8885,121 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_inner_error_ = NULL;
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = err;
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_->message;
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:1403: %s", _tmp11_);
-#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:1410: %s", _tmp11_);
+#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
-#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8785 "LibraryWindow.c"
+#line 8906 "LibraryWindow.c"
 	}
 	__finally40:
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_critical ("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 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8800 "LibraryWindow.c"
+#line 8921 "LibraryWindow.c"
 	}
-#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	alt_uri = NULL;
-#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = uri;
-#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = g_str_has_prefix (_tmp12_, "file://");
-#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 8810 "LibraryWindow.c"
+#line 8931 "LibraryWindow.c"
 		const gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
-#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = uri;
-#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = string_replace (_tmp14_, "file://", "disk:");
-#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = camera_table_get_port_uri (_tmp16_);
-#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (alt_uri);
-#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		alt_uri = _tmp17_;
-#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp16_);
-#line 8829 "LibraryWindow.c"
+#line 8950 "LibraryWindow.c"
 	}
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = at_startup;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp18_) {
-#line 8835 "LibraryWindow.c"
+#line 8956 "LibraryWindow.c"
 		const gchar* _tmp19_ = NULL;
 		gboolean _tmp20_ = FALSE;
 		const gchar* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
-#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = uri;
-#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = is_string_empty (_tmp19_);
-#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp20_) {
-#line 8846 "LibraryWindow.c"
+#line 8967 "LibraryWindow.c"
 			GeeHashSet* _tmp21_ = NULL;
 			const gchar* _tmp22_ = NULL;
-#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = library_window_initial_camera_uris;
-#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = uri;
-#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 8855 "LibraryWindow.c"
+#line 8976 "LibraryWindow.c"
 		}
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = alt_uri;
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = is_string_empty (_tmp23_);
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp24_) {
-#line 8863 "LibraryWindow.c"
+#line 8984 "LibraryWindow.c"
 			GeeHashSet* _tmp25_ = NULL;
 			const gchar* _tmp26_ = NULL;
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp25_ = library_window_initial_camera_uris;
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp26_ = alt_uri;
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_);
-#line 8872 "LibraryWindow.c"
+#line 8993 "LibraryWindow.c"
 		}
 	}
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (alt_uri);
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
-#line 8881 "LibraryWindow.c"
+#line 9002 "LibraryWindow.c"
 }
 
 
@@ -8895,97 +9016,97 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 	GdkEventKey* _tmp13_ = NULL;
 	guint _tmp14_ = 0U;
 	const gchar* _tmp15_ = NULL;
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "has-focus", &_tmp3_, NULL);
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 8910 "LibraryWindow.c"
+#line 9031 "LibraryWindow.c"
 		SidebarTree* _tmp5_ = NULL;
 		GdkEventKey* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = self->priv->sidebar_tree;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = event;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = sidebar_tree_is_keypress_interpreted (_tmp5_, _tmp6_);
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _tmp7_;
-#line 8922 "LibraryWindow.c"
+#line 9043 "LibraryWindow.c"
 	} else {
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = FALSE;
-#line 8926 "LibraryWindow.c"
+#line 9047 "LibraryWindow.c"
 	}
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp1_) {
-#line 8930 "LibraryWindow.c"
+#line 9051 "LibraryWindow.c"
 		SidebarTree* _tmp8_ = NULL;
 		GdkEventKey* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
-#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->sidebar_tree;
-#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = event;
-#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp9_, &_tmp10_);
-#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp10_;
-#line 8942 "LibraryWindow.c"
+#line 9063 "LibraryWindow.c"
 	} else {
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 8946 "LibraryWindow.c"
+#line 9067 "LibraryWindow.c"
 	}
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 8954 "LibraryWindow.c"
+#line 9075 "LibraryWindow.c"
 	}
-#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = event;
-#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = GTK_WIDGET_CLASS (library_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_) {
-#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 8966 "LibraryWindow.c"
+#line 9087 "LibraryWindow.c"
 	}
-#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = event;
-#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = _tmp13_->keyval;
-#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = gdk_keyval_name (_tmp14_);
-#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (g_strcmp0 (_tmp15_, "Escape") == 0) {
-#line 1433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_clear_search (self);
-#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 8982 "LibraryWindow.c"
+#line 9103 "LibraryWindow.c"
 	}
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 8988 "LibraryWindow.c"
+#line 9109 "LibraryWindow.c"
 }
 
 
@@ -9001,14 +9122,14 @@ gint library_window_get_PAGE_MIN_WIDTH (void) {
 	result = _tmp1_ + (CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING * 2);
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 9004 "LibraryWindow.c"
+#line 9125 "LibraryWindow.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 9011 "LibraryWindow.c"
+#line 9132 "LibraryWindow.c"
 }
 
 
@@ -9054,14 +9175,14 @@ static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_co
 	self->priv->view = _tmp5_;
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self;
-#line 9057 "LibraryWindow.c"
+#line 9178 "LibraryWindow.c"
 }
 
 
 static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, Photo* start, ViewCollection* view) {
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return library_window_fullscreen_photo_page_construct (LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, collection, start, view);
-#line 9064 "LibraryWindow.c"
+#line 9185 "LibraryWindow.c"
 }
 
 
@@ -9082,7 +9203,7 @@ static void library_window_fullscreen_photo_page_real_switched_to (Page* base) {
 	library_photo_page_display_for_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), _tmp0_, _tmp1_, _tmp2_);
 #line 84 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_CLASS (library_window_fullscreen_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), TYPE_PAGE, Page));
-#line 9085 "LibraryWindow.c"
+#line 9206 "LibraryWindow.c"
 }
 
 
@@ -9097,7 +9218,7 @@ static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames
 	_tmp0_ = ui_filenames;
 #line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
-#line 9100 "LibraryWindow.c"
+#line 9221 "LibraryWindow.c"
 }
 
 
@@ -9112,14 +9233,14 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc
 	((PageClass *) klass)->init_collect_ui_filenames = 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 9115 "LibraryWindow.c"
+#line 9236 "LibraryWindow.c"
 }
 
 
 static void library_window_fullscreen_photo_page_instance_init (LibraryWindowFullscreenPhotoPage * self) {
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv = LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_GET_PRIVATE (self);
-#line 9122 "LibraryWindow.c"
+#line 9243 "LibraryWindow.c"
 }
 
 
@@ -9135,7 +9256,7 @@ static void library_window_fullscreen_photo_page_finalize (GObject* obj) {
 	_data_collection_unref0 (self->priv->view);
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (library_window_fullscreen_photo_page_parent_class)->finalize (obj);
-#line 9138 "LibraryWindow.c"
+#line 9259 "LibraryWindow.c"
 }
 
 
@@ -9189,7 +9310,7 @@ static void library_window_class_init (LibraryWindowClass * klass) {
 	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_initial_camera_uris = _tmp0_;
-#line 9192 "LibraryWindow.c"
+#line 9313 "LibraryWindow.c"
 }
 
 
@@ -9213,6 +9334,7 @@ static void library_window_instance_init (LibraryWindow * self) {
 	BasicProperties* _tmp16_ = NULL;
 	GtkStack* _tmp17_ = NULL;
 	GtkBox* _tmp18_ = NULL;
+	GtkRevealer* _tmp19_ = NULL;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv = LIBRARY_WINDOW_GET_PRIVATE (self);
 #line 95 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9319,11 +9441,17 @@ static void library_window_instance_init (LibraryWindow * self) {
 	g_object_ref_sink (_tmp18_);
 #line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->layout = _tmp18_;
-#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->current_progress_priority = 0;
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp19_ = (GtkRevealer*) gtk_revealer_new ();
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_object_ref_sink (_tmp19_);
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->toolbar_revealer = _tmp19_;
 #line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->current_progress_priority = 0;
+#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = (guint) 0;
-#line 9326 "LibraryWindow.c"
+#line 9454 "LibraryWindow.c"
 }
 
 
@@ -9363,51 +9491,51 @@ static void library_window_finalize (GObject* obj) {
 	guint _tmp45_ = 0U;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->sidebar_tree;
-#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("page-created", SIDEBAR_TYPE_TREE, &_tmp1_, NULL, FALSE);
-#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self);
 #line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self);
+#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_TREE, &_tmp3_, NULL, FALSE);
-#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self);
 #line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self);
+#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->sidebar_tree;
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("entry-selected", SIDEBAR_TYPE_TREE, &_tmp5_, NULL, FALSE);
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self);
 #line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self);
+#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->sidebar_tree;
-#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("selected-entry-removed", SIDEBAR_TYPE_TREE, &_tmp7_, NULL, FALSE);
-#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self);
-#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_unsubscribe_from_basic_information (self, _tmp9_);
-#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp9_);
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->extended_properties;
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("hide", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self);
 #line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self);
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->extended_properties;
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE);
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _library_window_show_extended_properties_gtk_widget_show, self);
-#line 9410 "LibraryWindow.c"
+#line 9538 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp14_ = NULL;
@@ -9416,27 +9544,27 @@ static void library_window_finalize (GObject* obj) {
 		GeeCollection* _tmp17_ = NULL;
 		GeeIterator* _tmp18_ = NULL;
 		GeeIterator* _tmp19_ = NULL;
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = media_collection_registry_get_instance ();
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = _tmp14_;
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = media_collection_registry_get_all (_tmp15_);
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = _tmp18_;
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp17_);
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_collection_registry_unref0 (_tmp15_);
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_sources_it = _tmp19_;
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
-#line 9439 "LibraryWindow.c"
+#line 9567 "LibraryWindow.c"
 			GeeIterator* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			MediaSourceCollection* media_sources = NULL;
@@ -9446,105 +9574,105 @@ static void library_window_finalize (GObject* obj) {
 			guint _tmp25_ = 0U;
 			MediaSourceCollection* _tmp26_ = NULL;
 			guint _tmp27_ = 0U;
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = _media_sources_it;
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (!_tmp21_) {
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 9457 "LibraryWindow.c"
+#line 9585 "LibraryWindow.c"
 			}
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = _media_sources_it;
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp23_ = gee_iterator_get (_tmp22_);
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			media_sources = (MediaSourceCollection*) _tmp23_;
 #line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			media_sources = (MediaSourceCollection*) _tmp23_;
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp24_ = media_sources;
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp25_, NULL, FALSE);
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self);
 #line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self);
+#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp26_ = media_sources;
-#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp27_, NULL, FALSE);
-#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp27_, 0, NULL, (GCallback) _library_window_on_media_altered_data_collection_items_altered, self);
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
-#line 9479 "LibraryWindow.c"
+#line 9607 "LibraryWindow.c"
 		}
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 9483 "LibraryWindow.c"
+#line 9611 "LibraryWindow.c"
 	}
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = metadata_writer_get_instance ();
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = _tmp28_;
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp30_, NULL, FALSE);
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self);
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp29_);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = library_monitor_pool_get_instance ();
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = _tmp31_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = library_monitor_pool_get_monitor (_tmp32_);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = _tmp33_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp32_);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	monitor = _tmp34_;
 #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	monitor = _tmp34_;
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = monitor;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp35_ != NULL) {
-#line 9511 "LibraryWindow.c"
+#line 9639 "LibraryWindow.c"
 		LibraryMonitor* _tmp36_ = NULL;
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = monitor;
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_library_monitor_destroyed (self, _tmp36_);
-#line 9517 "LibraryWindow.c"
+#line 9645 "LibraryWindow.c"
 	}
-#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = library_monitor_pool_get_instance ();
-#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp38_ = _tmp37_;
-#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp39_, NULL, FALSE);
-#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self);
-#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp38_);
 #line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_library_monitor_pool_unref0 (_tmp38_);
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = library_monitor_pool_get_instance ();
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = _tmp40_;
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp42_, NULL, FALSE);
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp41_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp42_, 0, NULL, (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self);
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp41_);
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = camera_table_get_instance ();
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = _tmp43_;
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp45_, NULL, FALSE);
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp44_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp45_, 0, NULL, (GCallback) _library_window_on_camera_added_camera_table_camera_added, self);
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_camera_table_unref0 (_tmp44_);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (monitor);
@@ -9596,9 +9724,11 @@ static void library_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->layout);
 #line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->right_vbox);
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->toolbar_revealer);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (library_window_parent_class)->finalize (obj);
-#line 9601 "LibraryWindow.c"
+#line 9731 "LibraryWindow.c"
 }
 
 
@@ -9619,13 +9749,13 @@ static void _vala_library_window_get_property (GObject * object, guint property_
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	switch (property_id) {
-#line 9622 "LibraryWindow.c"
+#line 9752 "LibraryWindow.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		break;
-#line 9628 "LibraryWindow.c"
+#line 9758 "LibraryWindow.c"
 	}
 }
 
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index 2a34462..628bc36 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -137,6 +137,7 @@ public class LibraryWindow : AppWindow {
     private Gtk.Stack stack = new Gtk.Stack();
     private Gtk.Box layout = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
     private Gtk.Box right_vbox;
+    private Gtk.Revealer toolbar_revealer = new Gtk.Revealer ();
     
     private int current_progress_priority = 0;
     private uint background_progress_pulse_id = 0;
@@ -275,14 +276,9 @@ public class LibraryWindow : AppWindow {
         { "CommonDisplayBasicProperties", on_action_toggle, null, "false", on_display_basic_properties },
         { "CommonDisplayExtendedProperties", on_action_toggle, null, "false", on_display_extended_properties },
 
-#if 0
-        { "CommonDisplaySearchbar", on_display_searchbar, null, is_search_toolbar_visible.to_string () },
-        { "CommonDisplaySidebar", on_display_sidebar, null, is_sidebar_visible ().to_string () },
-        { "CommonDisplayToolbar", on_display_toolbar, null, is_toolbar_visible ().to_string () }
-#endif
-        { "CommonDisplaySearchbar", on_action_toggle, null, "false", on_display_searchbar },
+        { "CommonDisplaySearchbar", null, null, "false", on_display_searchbar },
         { "CommonDisplaySidebar", on_action_toggle, null, "true", on_display_sidebar },
-        { "CommonDisplayToolbar", on_action_toggle, null, "true", on_display_toolbar },
+        { "CommonDisplayToolbar", null, null, "true", on_display_toolbar },
 
         { "CommonSortEvents", on_action_radio, "s", "'ascending'", on_events_sort_changed }
     };
@@ -291,6 +287,10 @@ public class LibraryWindow : AppWindow {
         base.add_actions ();
         this.add_action_entries (common_actions, this);
         this.add_action_entries (search_actions.get_actions (), search_actions);
+
+        lookup_action ("CommonDisplaySearchbar").change_state (Config.Facade.get_instance().get_display_search_bar());
+        lookup_action ("CommonDisplaySidebar").change_state (is_sidebar_visible ());
+        lookup_action ("CommonDisplayToolbar").change_state (is_toolbar_visible ());
     }
 
     protected override void switched_pages(Page? old_page, Page? new_page) {
@@ -686,8 +686,7 @@ public class LibraryWindow : AppWindow {
 
         Config.Facade.get_instance().set_display_search_bar(is_shown);
         show_search_bar(is_shown);
-
-        action.set_state (value);
+        action.set_state (is_shown);
     }
     
     public void show_search_bar(bool display) {
@@ -722,9 +721,13 @@ public class LibraryWindow : AppWindow {
     }
 
     private void set_toolbar_visible (bool visible) {
+        if (get_current_page() == null) {
+            return;
+        }
+
         var toolbar = get_current_page ().get_toolbar ();
         if (toolbar != null) {
-            toolbar.set_visible (visible);
+            this.toolbar_revealer.set_reveal_child (visible);
         }
         Config.Facade.get_instance().set_display_toolbar (visible);
     }
@@ -1170,6 +1173,7 @@ public class LibraryWindow : AppWindow {
         right_vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
         right_vbox.pack_start(search_toolbar, false, false, 0);
         right_vbox.pack_start(stack, true, true, 0);
+        right_vbox.add (toolbar_revealer);
         
         client_paned = new Gtk.Paned(Gtk.Orientation.HORIZONTAL);
         client_paned.pack1(sidebar_paned, false, false);
@@ -1183,6 +1187,9 @@ public class LibraryWindow : AppWindow {
         
         add(layout);
 
+        var builder = new Gtk.Builder.from_resource ("/org/gnome/Shotwell/appmenu.ui");
+        Application.set_appmenu (builder.get_object ("appmenu") as GLib.Menu);
+
         switch_to_page(start_page);
         start_page.grab_focus();
     }
@@ -1210,7 +1217,7 @@ public class LibraryWindow : AppWindow {
 
             Gtk.Toolbar toolbar = current_page.get_toolbar();
             if (toolbar != null)
-                right_vbox.remove(toolbar);
+                toolbar_revealer.remove(toolbar);
 
             current_page.switching_from();
             
@@ -1268,9 +1275,9 @@ public class LibraryWindow : AppWindow {
         
         Gtk.Toolbar toolbar = page.get_toolbar();
         if (toolbar != null) {
-            right_vbox.add(toolbar);
+            toolbar_revealer.add(toolbar);
             toolbar.show_all();
-            toolbar.set_visible (this.is_toolbar_visible ());
+            toolbar_revealer.set_reveal_child (this.is_toolbar_visible ());
         }
 
         page.ready();
diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c
index 03b9c80..b8ec792 100644
--- a/src/library/OfflinePage.c
+++ b/src/library/OfflinePage.c
@@ -1,4 +1,4 @@
-/* OfflinePage.c generated by valac 0.34.2, the Vala compiler
+/* OfflinePage.c generated by valac 0.32.1, the Vala compiler
  * generated from OfflinePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/OfflineSidebarEntry.c b/src/library/OfflineSidebarEntry.c
index 5273583..a2025d1 100644
--- a/src/library/OfflineSidebarEntry.c
+++ b/src/library/OfflineSidebarEntry.c
@@ -1,4 +1,4 @@
-/* OfflineSidebarEntry.c generated by valac 0.34.2, the Vala compiler
+/* OfflineSidebarEntry.c generated by valac 0.32.1, the Vala compiler
  * generated from OfflineSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c
index 2186ff1..8c6cf47 100644
--- a/src/library/TrashPage.c
+++ b/src/library/TrashPage.c
@@ -1,4 +1,4 @@
-/* TrashPage.c generated by valac 0.34.2, the Vala compiler
+/* TrashPage.c generated by valac 0.32.1, the Vala compiler
  * generated from TrashPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/TrashSidebarEntry.c b/src/library/TrashSidebarEntry.c
index db1e2b9..0346c07 100644
--- a/src/library/TrashSidebarEntry.c
+++ b/src/library/TrashSidebarEntry.c
@@ -1,4 +1,4 @@
-/* TrashSidebarEntry.c generated by valac 0.34.2, the Vala compiler
+/* TrashSidebarEntry.c generated by valac 0.32.1, the Vala compiler
  * generated from TrashSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/main.c b/src/main.c
index 39b4026..83f5416 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,4 @@
-/* main.c generated by valac 0.34.2, the Vala compiler
+/* main.c generated by valac 0.32.1, the Vala compiler
  * generated from main.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2350,17 +2350,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 2358 "main.c"
 }
diff --git a/src/org.gnome.Shotwell.gresource.xml b/src/org.gnome.Shotwell.gresource.xml
deleted file mode 100644
index abf7eb2..0000000
--- a/src/org.gnome.Shotwell.gresource.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/Shotwell">
-      <file>crop-pivot-reticle.png</file>
-      <file>search_sidebar_context.ui</file>
-      <file>tag_sidebar_context.ui</file>
-      <file>sidebar_default_context.ui</file>
-      <file>search_bar.ui</file>
-  </gresource>
-</gresources>
diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c
index 19b2226..11ad8c6 100644
--- a/src/photos/BmpSupport.c
+++ b/src/photos/BmpSupport.c
@@ -1,4 +1,4 @@
-/* BmpSupport.c generated by valac 0.34.2, the Vala compiler
+/* BmpSupport.c generated by valac 0.32.1, the Vala compiler
  * generated from BmpSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1024,7 +1024,7 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp4__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 (_tmp3_, G_TYPE_INPUT_STREAM, GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c
index bbd7376..36e9c88 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -1,4 +1,4 @@
-/* GRaw.c generated by valac 0.34.2, the Vala compiler
+/* GRaw.c generated by valac 0.32.1, the Vala compiler
  * generated from GRaw.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -498,7 +498,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp10_ = _tmp9_;
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		_tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		_tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp12_ = _tmp11_;
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c
index 4f5a872..010572b 100644
--- a/src/photos/GdkSupport.c
+++ b/src/photos/GdkSupport.c
@@ -1,4 +1,4 @@
-/* GdkSupport.c generated by valac 0.34.2, the Vala compiler
+/* GdkSupport.c generated by valac 0.32.1, the Vala compiler
  * generated from GdkSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -930,7 +930,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			_tmp47__length1 = buffer_length1;
 #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp48_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), _tmp47_, (gsize) _tmp47__length1, NULL, &_inner_error_);
+			_tmp48_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_INPUT_STREAM, GInputStream), _tmp47_, (gsize) _tmp47__length1, NULL, &_inner_error_);
 #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			bytes_read = (gsize) _tmp48_;
 #line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1127,7 +1127,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp69_ = fins;
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
diff --git a/src/photos/JfifSupport.c b/src/photos/JfifSupport.c
index 0da9ce7..3c86a7a 100644
--- a/src/photos/JfifSupport.c
+++ b/src/photos/JfifSupport.c
@@ -1,4 +1,4 @@
-/* JfifSupport.c generated by valac 0.34.2, the Vala compiler
+/* JfifSupport.c generated by valac 0.32.1, the Vala compiler
  * generated from JfifSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1870,7 +1870,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 #line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp0_ = fins;
 #line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp1_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
+	_tmp1_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
 #line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	dins = _tmp1_;
 #line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c
index 19038b8..2f05603 100644
--- a/src/photos/PhotoFileAdapter.c
+++ b/src/photos/PhotoFileAdapter.c
@@ -1,4 +1,4 @@
-/* PhotoFileAdapter.c generated by valac 0.34.2, the Vala compiler
+/* PhotoFileAdapter.c generated by valac 0.32.1, the Vala compiler
  * generated from PhotoFileAdapter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c
index a033e19..6e05342 100644
--- a/src/photos/PhotoFileFormat.c
+++ b/src/photos/PhotoFileFormat.c
@@ -1,4 +1,4 @@
-/* PhotoFileFormat.c generated by valac 0.34.2, the Vala compiler
+/* PhotoFileFormat.c generated by valac 0.32.1, the Vala compiler
  * generated from PhotoFileFormat.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PhotoFileSniffer.c b/src/photos/PhotoFileSniffer.c
index 161349e..8d44d6b 100644
--- a/src/photos/PhotoFileSniffer.c
+++ b/src/photos/PhotoFileSniffer.c
@@ -1,4 +1,4 @@
-/* PhotoFileSniffer.c generated by valac 0.34.2, the Vala compiler
+/* PhotoFileSniffer.c generated by valac 0.32.1, the Vala compiler
  * generated from PhotoFileSniffer.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c
index def6140..148df86 100644
--- a/src/photos/PhotoMetadata.c
+++ b/src/photos/PhotoMetadata.c
@@ -1,4 +1,4 @@
-/* PhotoMetadata.c generated by valac 0.34.2, the Vala compiler
+/* PhotoMetadata.c generated by valac 0.32.1, the Vala compiler
  * generated from PhotoMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2058,7 +2058,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = _tmp4_;
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp6_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		_tmp6_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = _tmp6_;
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6719,19 +6719,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 6732 "PhotoMetadata.c"
 }
@@ -6741,17 +6741,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 6752 "PhotoMetadata.c"
 }
@@ -7296,11 +7296,11 @@ static gpointer _hierarchical_keyword_field_ref0 (gpointer self) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 7301 "PhotoMetadata.c"
 	{
@@ -7315,73 +7315,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 7332 "PhotoMetadata.c"
 				goto __catch25_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 7341 "PhotoMetadata.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 7357 "PhotoMetadata.c"
 				goto __catch25_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 7368 "PhotoMetadata.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 7382 "PhotoMetadata.c"
 	}
@@ -7389,24 +7389,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch25_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 7396 "PhotoMetadata.c"
 	}
 	__finally25:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
 #line 7407 "PhotoMetadata.c"
 	}
@@ -7420,37 +7420,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 7431 "PhotoMetadata.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 7439 "PhotoMetadata.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 7451 "PhotoMetadata.c"
 	}
@@ -7470,112 +7470,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 7475 "PhotoMetadata.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 7481 "PhotoMetadata.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 7485 "PhotoMetadata.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 7489 "PhotoMetadata.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 7501 "PhotoMetadata.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 7511 "PhotoMetadata.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 7517 "PhotoMetadata.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 7531 "PhotoMetadata.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 7541 "PhotoMetadata.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 7547 "PhotoMetadata.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 7556 "PhotoMetadata.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 7576 "PhotoMetadata.c"
 }
diff --git a/src/photos/Photos.c b/src/photos/Photos.c
index ee58ad3..434f905 100644
--- a/src/photos/Photos.c
+++ b/src/photos/Photos.c
@@ -1,4 +1,4 @@
-/* Photos.c generated by valac 0.34.2, the Vala compiler
+/* Photos.c generated by valac 0.32.1, 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 d3cb5c8..98d4cd2 100644
--- a/src/photos/PngSupport.c
+++ b/src/photos/PngSupport.c
@@ -1,4 +1,4 @@
-/* PngSupport.c generated by valac 0.34.2, the Vala compiler
+/* PngSupport.c generated by valac 0.32.1, the Vala compiler
  * generated from PngSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1020,7 +1020,7 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp4__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 (_tmp3_, G_TYPE_INPUT_STREAM, GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index 6a65390..f46b61e 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -1,4 +1,4 @@
-/* RawSupport.c generated by valac 0.34.2, the Vala compiler
+/* RawSupport.c generated by valac 0.32.1, the Vala compiler
  * generated from RawSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c
index 74004f3..2e1282e 100644
--- a/src/photos/TiffSupport.c
+++ b/src/photos/TiffSupport.c
@@ -1,4 +1,4 @@
-/* TiffSupport.c generated by valac 0.34.2, the Vala compiler
+/* TiffSupport.c generated by valac 0.32.1, the Vala compiler
  * generated from TiffSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1601,7 +1601,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 #line 1602 "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));
+	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	dins = _tmp3_;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
diff --git a/src/plugins/DataImportsInterfaces.c b/src/plugins/DataImportsInterfaces.c
index e7fb3d4..96920a9 100644
--- a/src/plugins/DataImportsInterfaces.c
+++ b/src/plugins/DataImportsInterfaces.c
@@ -1,4 +1,4 @@
-/* DataImportsInterfaces.c generated by valac 0.34.2, the Vala compiler
+/* DataImportsInterfaces.c generated by valac 0.32.1, 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 6a9f109..a542964 100644
--- a/src/plugins/ManifestWidget.c
+++ b/src/plugins/ManifestWidget.c
@@ -1,4 +1,4 @@
-/* ManifestWidget.c generated by valac 0.34.2, the Vala compiler
+/* ManifestWidget.c generated by valac 0.32.1, the Vala compiler
  * generated from ManifestWidget.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -245,19 +245,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 263 "ManifestWidget.c"
 }
@@ -1402,7 +1402,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp46_ = _tmp45_;
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-				_tmp47_ = gtk_icon_theme_lookup_by_gicon (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_icon_get_type (), GIcon), PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE, 0);
+				_tmp47_ = gtk_icon_theme_lookup_by_gicon (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_ICON, GIcon), PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE, 0);
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp48_ = _tmp47_;
 #line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -2187,7 +2187,7 @@ static void plugins_manifest_list_view_instance_init (PluginsManifestListView *
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self->priv = PLUGINS_MANIFEST_LIST_VIEW_GET_PRIVATE (self);
 #line 122 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp0_ = gtk_tree_store_new ((gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, gdk_pixbuf_get_type (), G_TYPE_STRING, G_TYPE_STRING);
+	_tmp0_ = gtk_tree_store_new ((gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
 #line 122 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self->priv->store = _tmp0_;
 #line 2194 "ManifestWidget.c"
diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c
index 8040d16..245a6b2 100644
--- a/src/plugins/Plugins.c
+++ b/src/plugins/Plugins.c
@@ -1,4 +1,4 @@
-/* Plugins.c generated by valac 0.34.2, the Vala compiler
+/* Plugins.c generated by valac 0.32.1, the Vala compiler
  * generated from Plugins.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/PublishingInterfaces.c b/src/plugins/PublishingInterfaces.c
index f42f462..e2e22cb 100644
--- a/src/plugins/PublishingInterfaces.c
+++ b/src/plugins/PublishingInterfaces.c
@@ -1,4 +1,4 @@
-/* PublishingInterfaces.c generated by valac 0.34.2, the Vala compiler
+/* PublishingInterfaces.c generated by valac 0.32.1, 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 da797f9..9357a68 100644
--- a/src/plugins/SpitInterfaces.c
+++ b/src/plugins/SpitInterfaces.c
@@ -1,4 +1,4 @@
-/* SpitInterfaces.c generated by valac 0.34.2, the Vala compiler
+/* SpitInterfaces.c generated by valac 0.32.1, 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 7e300b8..3465427 100644
--- a/src/plugins/StandardHostInterface.c
+++ b/src/plugins/StandardHostInterface.c
@@ -1,4 +1,4 @@
-/* StandardHostInterface.c generated by valac 0.34.2, the Vala compiler
+/* StandardHostInterface.c generated by valac 0.32.1, 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 1f05177..aedb555 100644
--- a/src/plugins/TransitionsInterfaces.c
+++ b/src/plugins/TransitionsInterfaces.c
@@ -1,4 +1,4 @@
-/* TransitionsInterfaces.c generated by valac 0.34.2, the Vala compiler
+/* TransitionsInterfaces.c generated by valac 0.32.1, the Vala compiler
  * generated from TransitionsInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -726,7 +726,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k
 	     * If transitioning from a blank screen, this will return null.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_PIXBUF, g_param_spec_object ("from-pixbuf", "from-pixbuf", "from-pixbuf", GDK_TYPE_PIXBUF, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 731 "TransitionsInterfaces.c"
 	/**
 	     * Returns the position of the starting pixbuf on the display.
@@ -734,7 +734,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k
 	     * If transitioning from a blank screen, this will be zeroed.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_FROM_POS, g_param_spec_boxed ("from-pos", "from-pos", "from-pos", GDK_TYPE_RECTANGLE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 739 "TransitionsInterfaces.c"
 	/**
 	     * Returns the ending pixbuf (the pixbuf that the transition should result in).
@@ -742,7 +742,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k
 	     * If transitioning to a blank screen, this will return null.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_PIXBUF, g_param_spec_object ("to-pixbuf", "to-pixbuf", "to-pixbuf", GDK_TYPE_PIXBUF, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 747 "TransitionsInterfaces.c"
 	/**
 	     * Returns the position of the ending pixbuf on the display.
@@ -750,7 +750,7 @@ static void spit_transitions_visuals_class_init (SpitTransitionsVisualsClass * k
 	     * If transitioning to a blank screen, this will be zeroed.
 	     */
 #line 60 "/home/jens/Source/shotwell/src/plugins/TransitionsInterfaces.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", gdk_rectangle_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SPIT_TRANSITIONS_VISUALS_TO_POS, g_param_spec_boxed ("to-pos", "to-pos", "to-pos", GDK_TYPE_RECTANGLE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 755 "TransitionsInterfaces.c"
 	/**
 	     * Returns the background color of the viewport.
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index 1355179..329e415 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -1,4 +1,4 @@
-/* APIGlue.c generated by valac 0.34.2, the Vala compiler
+/* APIGlue.c generated by valac 0.32.1, the Vala compiler
  * generated from APIGlue.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/publishing/Publishing.c b/src/publishing/Publishing.c
index 603fb4c..fc14775 100644
--- a/src/publishing/Publishing.c
+++ b/src/publishing/Publishing.c
@@ -1,4 +1,4 @@
-/* Publishing.c generated by valac 0.34.2, the Vala compiler
+/* Publishing.c generated by valac 0.32.1, 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 dd7f5a0..94f48ea 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -1,4 +1,4 @@
-/* PublishingPluginHost.c generated by valac 0.34.2, the Vala compiler
+/* PublishingPluginHost.c generated by valac 0.32.1, 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 fbe90d8..36d6265 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -1,4 +1,4 @@
-/* PublishingUI.c generated by valac 0.34.2, the Vala compiler
+/* PublishingUI.c generated by valac 0.32.1, the Vala compiler
  * generated from PublishingUI.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1113,7 +1113,7 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp5_ = num_uploaded;
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp6_ = ngettext ("The selected video was successfully published.", "The selected videos were successfully published.", (gulong) _tmp5_);
+			_tmp6_ = ngettext ("The selected photo was successfully published.", "The selected photos were successfully published.", (gulong) _tmp5_);
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = g_strdup (_tmp6_);
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1643,7 +1643,7 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 #line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp42_);
 #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp43_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
+	_tmp43_ = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING, -1);
 #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->service_selector_box_model);
 #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index 8303f40..91a2bf4 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -106,8 +106,8 @@ public class SuccessPane : StaticMessagePane {
                                        num_uploaded);
         }
         else if (published_media == Spit.Publishing.Publisher.MediaType.PHOTO) {
-            message_string = ngettext ("The selected video was successfully published.",
-                                       "The selected videos were successfully published.",
+            message_string = ngettext ("The selected photo was successfully published.",
+                                       "The selected photos were successfully published.",
                                        num_uploaded);
         }
         else if (published_media == (Spit.Publishing.Publisher.MediaType.PHOTO
diff --git a/src/searches/Branch.c b/src/searches/Branch.c
index c582a55..9956e8d 100644
--- a/src/searches/Branch.c
+++ b/src/searches/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.2, the Vala compiler
+/* Branch.c generated by valac 0.32.1, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c
index 6fa32e2..278f4f0 100644
--- a/src/searches/SavedSearchDialog.c
+++ b/src/searches/SavedSearchDialog.c
@@ -1,4 +1,4 @@
-/* SavedSearchDialog.c generated by valac 0.34.2, the Vala compiler
+/* SavedSearchDialog.c generated by valac 0.32.1, the Vala compiler
  * generated from SavedSearchDialog.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1779,19 +1779,19 @@ static gchar* string_chomp (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1191 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strchomp (_tmp1_);
-#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 1797 "SavedSearchDialog.c"
 }
diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c
index 699003c..1dc2f9b 100644
--- a/src/searches/SavedSearchPage.c
+++ b/src/searches/SavedSearchPage.c
@@ -1,4 +1,4 @@
-/* SavedSearchPage.c generated by valac 0.34.2, the Vala compiler
+/* SavedSearchPage.c generated by valac 0.32.1, the Vala compiler
  * generated from SavedSearchPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index 3710948..7da26c1 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -1,4 +1,4 @@
-/* SearchBoolean.c generated by valac 0.34.2, the Vala compiler
+/* SearchBoolean.c generated by valac 0.32.1, the Vala compiler
  * generated from SearchBoolean.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2305,17 +2305,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 2320 "SearchBoolean.c"
 }
diff --git a/src/searches/Searches.c b/src/searches/Searches.c
index f6933e7..1ab6b90 100644
--- a/src/searches/Searches.c
+++ b/src/searches/Searches.c
@@ -1,4 +1,4 @@
-/* Searches.c generated by valac 0.34.2, the Vala compiler
+/* Searches.c generated by valac 0.32.1, 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 0e316cb..10f7a72 100644
--- a/src/sidebar/Branch.c
+++ b/src/sidebar/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.2, the Vala compiler
+/* Branch.c generated by valac 0.32.1, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/Entry.c b/src/sidebar/Entry.c
index 62b6068..caa621c 100644
--- a/src/sidebar/Entry.c
+++ b/src/sidebar/Entry.c
@@ -1,4 +1,4 @@
-/* Entry.c generated by valac 0.34.2, the Vala compiler
+/* Entry.c generated by valac 0.32.1, 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 3d479a0..888a70c 100644
--- a/src/sidebar/Sidebar.c
+++ b/src/sidebar/Sidebar.c
@@ -1,4 +1,4 @@
-/* Sidebar.c generated by valac 0.34.2, the Vala compiler
+/* Sidebar.c generated by valac 0.32.1, 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 8cef7f3..f297897 100644
--- a/src/sidebar/Tree.c
+++ b/src/sidebar/Tree.c
@@ -1,4 +1,4 @@
-/* Tree.c generated by valac 0.34.2, the Vala compiler
+/* Tree.c generated by valac 0.32.1, the Vala compiler
  * generated from Tree.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/common.c b/src/sidebar/common.c
index 57f215c..1ef4450 100644
--- a/src/sidebar/common.c
+++ b/src/sidebar/common.c
@@ -1,4 +1,4 @@
-/* common.c generated by valac 0.34.2, the Vala compiler
+/* common.c generated by valac 0.32.1, the Vala compiler
  * generated from common.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/slideshow/Slideshow.c b/src/slideshow/Slideshow.c
index 10edf7f..1731cfa 100644
--- a/src/slideshow/Slideshow.c
+++ b/src/slideshow/Slideshow.c
@@ -1,4 +1,4 @@
-/* Slideshow.c generated by valac 0.34.2, the Vala compiler
+/* Slideshow.c generated by valac 0.32.1, 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 7040759..292187e 100644
--- a/src/slideshow/TransitionEffects.c
+++ b/src/slideshow/TransitionEffects.c
@@ -1,4 +1,4 @@
-/* TransitionEffects.c generated by valac 0.34.2, the Vala compiler
+/* TransitionEffects.c generated by valac 0.32.1, the Vala compiler
  * generated from TransitionEffects.vala, do not modify */
 
 /* Copyright 2010 Maxim Kartashev
diff --git a/src/tags/Branch.c b/src/tags/Branch.c
index f80040a..30e05f0 100644
--- a/src/tags/Branch.c
+++ b/src/tags/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.2, the Vala compiler
+/* Branch.c generated by valac 0.32.1, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2212,11 +2212,11 @@ static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEnt
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 2222 "Branch.c"
 	{
@@ -2231,73 +2231,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 2253 "Branch.c"
 				goto __catch52_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 2262 "Branch.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 2278 "Branch.c"
 				goto __catch52_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 2289 "Branch.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 2303 "Branch.c"
 	}
@@ -2305,24 +2305,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch52_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 2317 "Branch.c"
 	}
 	__finally52:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
 #line 2328 "Branch.c"
 	}
@@ -2837,39 +2837,39 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	gint _tmp3__length1 = 0;
 	guint8* _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
 #line 2869 "Branch.c"
 	}
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 2875 "Branch.c"
 }
diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c
index 39c417b..dc5e970 100644
--- a/src/tags/HierarchicalTagIndex.c
+++ b/src/tags/HierarchicalTagIndex.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagIndex.c generated by valac 0.34.2, the Vala compiler
+/* HierarchicalTagIndex.c generated by valac 0.32.1, the Vala compiler
  * generated from HierarchicalTagIndex.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c
index f4993c0..05d9126 100644
--- a/src/tags/HierarchicalTagUtilities.c
+++ b/src/tags/HierarchicalTagUtilities.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagUtilities.c generated by valac 0.34.2, the Vala compiler
+/* HierarchicalTagUtilities.c generated by valac 0.32.1, the Vala compiler
  * generated from HierarchicalTagUtilities.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -263,37 +263,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 279 "HierarchicalTagUtilities.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 287 "HierarchicalTagUtilities.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 299 "HierarchicalTagUtilities.c"
 	}
@@ -313,112 +313,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 323 "HierarchicalTagUtilities.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 329 "HierarchicalTagUtilities.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 333 "HierarchicalTagUtilities.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 337 "HierarchicalTagUtilities.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 349 "HierarchicalTagUtilities.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 359 "HierarchicalTagUtilities.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 365 "HierarchicalTagUtilities.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 379 "HierarchicalTagUtilities.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 389 "HierarchicalTagUtilities.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 395 "HierarchicalTagUtilities.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 404 "HierarchicalTagUtilities.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 424 "HierarchicalTagUtilities.c"
 }
@@ -756,72 +756,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	gboolean _tmp2_ = FALSE;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		separator = "";
 #line 766 "HierarchicalTagUtilities.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 776 "HierarchicalTagUtilities.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 786 "HierarchicalTagUtilities.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 792 "HierarchicalTagUtilities.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 803 "HierarchicalTagUtilities.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 815 "HierarchicalTagUtilities.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 819 "HierarchicalTagUtilities.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 823 "HierarchicalTagUtilities.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 827 "HierarchicalTagUtilities.c"
 		gint i = 0;
@@ -844,16 +844,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp44_ = NULL;
 		void* _tmp45_ = NULL;
 		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 850 "HierarchicalTagUtilities.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 859 "HierarchicalTagUtilities.c"
 				gboolean _tmp11_ = FALSE;
@@ -866,97 +866,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gint _tmp23_ = 0;
 				const gchar* _tmp24_ = NULL;
 				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 872 "HierarchicalTagUtilities.c"
 					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 878 "HierarchicalTagUtilities.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 888 "HierarchicalTagUtilities.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 900 "HierarchicalTagUtilities.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 904 "HierarchicalTagUtilities.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 910 "HierarchicalTagUtilities.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 921 "HierarchicalTagUtilities.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
 						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 936 "HierarchicalTagUtilities.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 940 "HierarchicalTagUtilities.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 944 "HierarchicalTagUtilities.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					break;
 #line 950 "HierarchicalTagUtilities.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 962 "HierarchicalTagUtilities.c"
 					gchar** _tmp25_ = NULL;
@@ -965,91 +965,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					const gchar* _tmp27_ = NULL;
 					gint _tmp28_ = 0;
 					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 983 "HierarchicalTagUtilities.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 987 "HierarchicalTagUtilities.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 993 "HierarchicalTagUtilities.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 1000 "HierarchicalTagUtilities.c"
 			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return result;
 #line 1008 "HierarchicalTagUtilities.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 1046 "HierarchicalTagUtilities.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 1055 "HierarchicalTagUtilities.c"
 				gint _tmp48_ = 0;
@@ -1065,94 +1065,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				const gchar* _tmp56_ = NULL;
 				void* _tmp60_ = NULL;
 				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 1071 "HierarchicalTagUtilities.c"
 					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 1077 "HierarchicalTagUtilities.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					break;
 #line 1091 "HierarchicalTagUtilities.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 1111 "HierarchicalTagUtilities.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
 					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 1126 "HierarchicalTagUtilities.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 1130 "HierarchicalTagUtilities.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 1138 "HierarchicalTagUtilities.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1149 "HierarchicalTagUtilities.c"
 	} else {
 		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1158 "HierarchicalTagUtilities.c"
 	}
@@ -1273,11 +1273,11 @@ gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 1283 "HierarchicalTagUtilities.c"
 	{
@@ -1292,73 +1292,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1314 "HierarchicalTagUtilities.c"
 				goto __catch53_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 1323 "HierarchicalTagUtilities.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1339 "HierarchicalTagUtilities.c"
 				goto __catch53_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 1350 "HierarchicalTagUtilities.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1364 "HierarchicalTagUtilities.c"
 	}
@@ -1366,24 +1366,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch53_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 1378 "HierarchicalTagUtilities.c"
 	}
 	__finally53:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
 #line 1389 "HierarchicalTagUtilities.c"
 	}
@@ -1394,15 +1394,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 1408 "HierarchicalTagUtilities.c"
 }
diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c
index 5829bfc..8a95878 100644
--- a/src/tags/TagPage.c
+++ b/src/tags/TagPage.c
@@ -1,4 +1,4 @@
-/* TagPage.c generated by valac 0.34.2, the Vala compiler
+/* TagPage.c generated by valac 0.32.1, the Vala compiler
  * generated from TagPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/tags/Tags.c b/src/tags/Tags.c
index 901cc2a..0f14960 100644
--- a/src/tags/Tags.c
+++ b/src/tags/Tags.c
@@ -1,4 +1,4 @@
-/* Tags.c generated by valac 0.34.2, the Vala compiler
+/* Tags.c generated by valac 0.32.1, 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 caeab3b..006e1b0 100644
--- a/src/threads/BackgroundJob.c
+++ b/src/threads/BackgroundJob.c
@@ -1,4 +1,4 @@
-/* BackgroundJob.c generated by valac 0.34.2, the Vala compiler
+/* BackgroundJob.c generated by valac 0.32.1, the Vala compiler
  * generated from BackgroundJob.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/Semaphore.c b/src/threads/Semaphore.c
index d22656b..9874b65 100644
--- a/src/threads/Semaphore.c
+++ b/src/threads/Semaphore.c
@@ -1,4 +1,4 @@
-/* Semaphore.c generated by valac 0.34.2, the Vala compiler
+/* Semaphore.c generated by valac 0.32.1, the Vala compiler
  * generated from Semaphore.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/Threads.c b/src/threads/Threads.c
index 3c5eaea..d87457f 100644
--- a/src/threads/Threads.c
+++ b/src/threads/Threads.c
@@ -1,4 +1,4 @@
-/* Threads.c generated by valac 0.34.2, the Vala compiler
+/* Threads.c generated by valac 0.32.1, 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 35b0d27..92d5e97 100644
--- a/src/threads/Workers.c
+++ b/src/threads/Workers.c
@@ -1,4 +1,4 @@
-/* Workers.c generated by valac 0.34.2, the Vala compiler
+/* Workers.c generated by valac 0.32.1, the Vala compiler
  * generated from Workers.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/unit/Unit.c b/src/unit/Unit.c
index 2d7acb8..d652834 100644
--- a/src/unit/Unit.c
+++ b/src/unit/Unit.c
@@ -1,4 +1,4 @@
-/* Unit.c generated by valac 0.34.2, the Vala compiler
+/* Unit.c generated by valac 0.32.1, 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 180a69a..003f0ca 100644
--- a/src/util/KeyValueMap.c
+++ b/src/util/KeyValueMap.c
@@ -1,4 +1,4 @@
-/* KeyValueMap.c generated by valac 0.34.2, the Vala compiler
+/* KeyValueMap.c generated by valac 0.32.1, the Vala compiler
  * generated from KeyValueMap.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -355,23 +355,23 @@ static gchar* double_to_string (gdouble self) {
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1__length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = g_ascii_dtostr (_tmp1_, G_ASCII_DTOSTR_BUF_SIZE, self);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = (g_free (_tmp1_), NULL);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 377 "KeyValueMap.c"
 }
@@ -445,24 +445,24 @@ void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value)
 
 static gchar* bool_to_string (gboolean self) {
 	gchar* result = NULL;
-#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (self) {
 #line 451 "KeyValueMap.c"
 		gchar* _tmp0_ = NULL;
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strdup ("true");
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp0_;
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 459 "KeyValueMap.c"
 	} else {
 		gchar* _tmp1_ = NULL;
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_strdup ("false");
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp1_;
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 468 "KeyValueMap.c"
 	}
@@ -610,15 +610,15 @@ static gdouble double_parse (const gchar* str) {
 	gdouble result = 0.0;
 	const gchar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 869 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 869 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0.0);
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtod (_tmp0_, NULL);
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 624 "KeyValueMap.c"
 }
@@ -731,21 +731,21 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
 static gboolean bool_parse (const gchar* str) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-#line 44 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 44 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, FALSE);
-#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 45 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 45 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (g_strcmp0 (_tmp0_, "true") == 0) {
-#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 46 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = TRUE;
-#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 46 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 745 "KeyValueMap.c"
 	} else {
-#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = FALSE;
-#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 751 "KeyValueMap.c"
 	}
diff --git a/src/util/Util.c b/src/util/Util.c
index 33aa26e..ec9f4ff 100644
--- a/src/util/Util.c
+++ b/src/util/Util.c
@@ -1,4 +1,4 @@
-/* Util.c generated by valac 0.34.2, the Vala compiler
+/* Util.c generated by valac 0.32.1, 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 9baf18c..b219fd2 100644
--- a/src/util/file.c
+++ b/src/util/file.c
@@ -1,4 +1,4 @@
-/* file.c generated by valac 0.34.2, the Vala compiler
+/* file.c generated by valac 0.32.1, the Vala compiler
  * generated from file.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -411,37 +411,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 427 "file.c"
 		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 435 "file.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 447 "file.c"
 	}
@@ -461,112 +461,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 471 "file.c"
 		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 477 "file.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 481 "file.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 485 "file.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 497 "file.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 507 "file.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 513 "file.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 527 "file.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 537 "file.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 543 "file.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 552 "file.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 572 "file.c"
 }
diff --git a/src/util/image.c b/src/util/image.c
index 9e1bb80..a68553e 100644
--- a/src/util/image.c
+++ b/src/util/image.c
@@ -1,4 +1,4 @@
-/* image.c generated by valac 0.34.2, the Vala compiler
+/* image.c generated by valac 0.32.1, the Vala compiler
  * generated from image.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -18,55 +18,12 @@
 #include <gtk/gtk.h>
 #include <float.h>
 #include <math.h>
-#include <gio/gio.h>
 
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define TYPE_DIMENSIONS (dimensions_get_type ())
 typedef struct _Dimensions Dimensions;
-
-#define TYPE_PIXEL_TRANSFORMER (pixel_transformer_get_type ())
-#define PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformer))
-#define PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
-#define IS_PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMER))
-#define IS_PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMER))
-#define PIXEL_TRANSFORMER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
-
-typedef struct _PixelTransformer PixelTransformer;
-typedef struct _PixelTransformerClass PixelTransformerClass;
-
-#define TYPE_PIXEL_TRANSFORMATION (pixel_transformation_get_type ())
-#define PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformation))
-#define PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass))
-#define IS_PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION))
-#define IS_PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION))
-#define PIXEL_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass))
-
-typedef struct _PixelTransformation PixelTransformation;
-typedef struct _PixelTransformationClass PixelTransformationClass;
-
-#define TYPE_RGB_TRANSFORMATION (rgb_transformation_get_type ())
-#define RGB_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RGB_TRANSFORMATION, RGBTransformation))
-#define RGB_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RGB_TRANSFORMATION, RGBTransformationClass))
-#define IS_RGB_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RGB_TRANSFORMATION))
-#define IS_RGB_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RGB_TRANSFORMATION))
-#define RGB_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RGB_TRANSFORMATION, RGBTransformationClass))
-
-typedef struct _RGBTransformation RGBTransformation;
-typedef struct _RGBTransformationClass RGBTransformationClass;
-
-#define TYPE_SATURATION_TRANSFORMATION (saturation_transformation_get_type ())
-#define SATURATION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SATURATION_TRANSFORMATION, SaturationTransformation))
-#define SATURATION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SATURATION_TRANSFORMATION, SaturationTransformationClass))
-#define IS_SATURATION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SATURATION_TRANSFORMATION))
-#define IS_SATURATION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SATURATION_TRANSFORMATION))
-#define SATURATION_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SATURATION_TRANSFORMATION, SaturationTransformationClass))
-
-typedef struct _SaturationTransformation SaturationTransformation;
-typedef struct _SaturationTransformationClass SaturationTransformationClass;
-#define _pixel_transformation_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_unref (var), NULL)))
-#define _pixel_transformer_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformer_unref (var), NULL)))
 #define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
 #define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL)))
 
@@ -112,30 +69,6 @@ void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gd
 gint dimensions_minor_axis (Dimensions *self);
 guchar shift_color_byte (gint b, gint shift);
 void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alpha);
-void dim_pixbuf (GdkPixbuf* pixbuf);
-gpointer pixel_transformer_ref (gpointer instance);
-void pixel_transformer_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformer (GValue* value, gpointer v_object);
-void value_take_pixel_transformer (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformer (const GValue* value);
-GType pixel_transformer_get_type (void) G_GNUC_CONST;
-PixelTransformer* pixel_transformer_new (void);
-PixelTransformer* pixel_transformer_construct (GType object_type);
-gpointer pixel_transformation_ref (gpointer instance);
-void pixel_transformation_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation (GValue* value, gpointer v_object);
-void value_take_pixel_transformation (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformation (const GValue* value);
-GType pixel_transformation_get_type (void) G_GNUC_CONST;
-GType rgb_transformation_get_type (void) G_GNUC_CONST;
-GType saturation_transformation_get_type (void) G_GNUC_CONST;
-#define SATURATION_TRANSFORMATION_MIN_PARAMETER (-16.0f)
-SaturationTransformation* saturation_transformation_new (gfloat client_parameter);
-SaturationTransformation* saturation_transformation_construct (GType object_type, gfloat client_parameter);
-void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTransformation* trans);
-void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixbuf, GCancellable* cancellable);
 gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect);
 gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b);
 gchar* rectangle_to_string (GdkRectangle* rect);
@@ -175,7 +108,7 @@ gboolean is_color_parsable (const gchar* spec) {
 	result = _tmp1_;
 #line 119 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 179 "image.c"
+#line 112 "image.c"
 }
 
 
@@ -192,7 +125,7 @@ void parse_color (const gchar* spec, GdkRGBA* result) {
 	*result = _tmp1_;
 #line 123 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 196 "image.c"
+#line 129 "image.c"
 }
 
 
@@ -210,19 +143,19 @@ void fetch_color (const gchar* spec, GdkRGBA* result) {
 	_tmp1_ = gdk_rgba_parse (&rgba, _tmp0_);
 #line 128 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (!_tmp1_) {
-#line 214 "image.c"
+#line 147 "image.c"
 		const gchar* _tmp2_ = NULL;
 #line 129 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = spec;
 #line 129 "/home/jens/Source/shotwell/src/util/image.vala"
 		g_error ("image.vala:129: Can't parse color %s", _tmp2_);
-#line 220 "image.c"
+#line 153 "image.c"
 	}
 #line 131 "/home/jens/Source/shotwell/src/util/image.vala"
 	*result = rgba;
 #line 131 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 226 "image.c"
+#line 159 "image.c"
 }
 
 
@@ -269,14 +202,14 @@ void set_source_color_from_string (cairo_t* ctx, const gchar* spec) {
 	_tmp10_ = _tmp9_.alpha;
 #line 136 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_set_source_rgba (_tmp2_, _tmp4_, _tmp6_, _tmp8_, _tmp10_);
-#line 273 "image.c"
+#line 206 "image.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 147 "/home/jens/Source/shotwell/src/util/image.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 280 "image.c"
+#line 213 "image.c"
 }
 
 
@@ -286,7 +219,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 	GError * _inner_error_ = NULL;
 #line 144 "/home/jens/Source/shotwell/src/util/image.vala"
 	pixbuf = NULL;
-#line 290 "image.c"
+#line 223 "image.c"
 	{
 		GtkIconTheme* icon_theme = NULL;
 		GtkIconTheme* _tmp0_ = NULL;
@@ -308,7 +241,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 148 "/home/jens/Source/shotwell/src/util/image.vala"
 			_g_object_unref0 (icon_theme);
-#line 312 "image.c"
+#line 245 "image.c"
 			goto __catch4_g_error;
 		}
 #line 148 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -323,7 +256,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 		_g_object_unref0 (_tmp2_);
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
 		_g_object_unref0 (icon_theme);
-#line 327 "image.c"
+#line 260 "image.c"
 	}
 	goto __finally4;
 	__catch4_g_error:
@@ -350,7 +283,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 		g_warning ("image.vala:152: Could not load icon from theme: %s", _tmp7_);
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
 		_g_error_free0 (_error_);
-#line 354 "image.c"
+#line 287 "image.c"
 	}
 	__finally4:
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -363,13 +296,13 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 		g_clear_error (&_inner_error_);
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
 		return NULL;
-#line 367 "image.c"
+#line 300 "image.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/util/image.vala"
 	result = pixbuf;
 #line 155 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 373 "image.c"
+#line 306 "image.c"
 }
 
 
@@ -421,7 +354,7 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 	_tmp9_ = _tmp8_.width;
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp7_ == _tmp9_) {
-#line 425 "image.c"
+#line 358 "image.c"
 		Dimensions _tmp10_ = {0};
 		gint _tmp11_ = 0;
 		Dimensions _tmp12_ = {0};
@@ -436,15 +369,15 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 		_tmp13_ = _tmp12_.height;
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp5_ = _tmp11_ == _tmp13_;
-#line 440 "image.c"
+#line 373 "image.c"
 	} else {
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp5_ = FALSE;
-#line 444 "image.c"
+#line 377 "image.c"
 	}
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp5_) {
-#line 448 "image.c"
+#line 381 "image.c"
 		GdkPixbuf* _tmp14_ = NULL;
 		GdkPixbuf* _tmp15_ = NULL;
 #line 162 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -455,7 +388,7 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 		result = _tmp15_;
 #line 162 "/home/jens/Source/shotwell/src/util/image.vala"
 		return result;
-#line 459 "image.c"
+#line 392 "image.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/util/image.vala"
 	dimensions_with_min (&scaled, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp16_);
@@ -479,7 +412,7 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 	result = _tmp23_;
 #line 167 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 483 "image.c"
+#line 416 "image.c"
 }
 
 
@@ -521,7 +454,7 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 	_tmp6_ = _tmp5_.width;
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ == _tmp6_) {
-#line 525 "image.c"
+#line 458 "image.c"
 		Dimensions _tmp7_ = {0};
 		gint _tmp8_ = 0;
 		Dimensions _tmp9_ = {0};
@@ -536,15 +469,15 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 		_tmp10_ = _tmp9_.height;
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = _tmp8_ == _tmp10_;
-#line 540 "image.c"
+#line 473 "image.c"
 	} else {
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = FALSE;
-#line 544 "image.c"
+#line 477 "image.c"
 	}
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
-#line 548 "image.c"
+#line 481 "image.c"
 		GdkPixbuf* _tmp11_ = NULL;
 		GdkPixbuf* _tmp12_ = NULL;
 #line 173 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -555,7 +488,7 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 		result = _tmp12_;
 #line 173 "/home/jens/Source/shotwell/src/util/image.vala"
 		return result;
-#line 559 "image.c"
+#line 492 "image.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/util/image.vala"
 	dimensions_with_min (resized, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp13_);
@@ -579,7 +512,7 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 	result = _tmp20_;
 #line 178 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 583 "image.c"
+#line 516 "image.c"
 }
 
 
@@ -609,7 +542,7 @@ void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origi
 	_tmp4_ = ctx;
 #line 186 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_paint (_tmp4_);
-#line 613 "image.c"
+#line 546 "image.c"
 }
 
 
@@ -715,7 +648,7 @@ void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gd
 	_tmp21_ = cx;
 #line 209 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_clip (_tmp21_);
-#line 719 "image.c"
+#line 652 "image.c"
 }
 
 
@@ -734,7 +667,7 @@ inline guchar shift_color_byte (gint b, gint shift) {
 	result = (guchar) _tmp2_;
 #line 213 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 738 "image.c"
+#line 671 "image.c"
 }
 
 
@@ -773,17 +706,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp1_ = red;
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_ >= -255) {
-#line 777 "image.c"
+#line 710 "image.c"
 		gint _tmp2_ = 0;
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = red;
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = _tmp2_ <= 255;
-#line 783 "image.c"
+#line 716 "image.c"
 	} else {
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = FALSE;
-#line 787 "image.c"
+#line 720 "image.c"
 	}
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp0_, "red >= -255 && red <= 255");
@@ -791,17 +724,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp4_ = green;
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ >= -255) {
-#line 795 "image.c"
+#line 728 "image.c"
 		gint _tmp5_ = 0;
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp5_ = green;
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp3_ = _tmp5_ <= 255;
-#line 801 "image.c"
+#line 734 "image.c"
 	} else {
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp3_ = FALSE;
-#line 805 "image.c"
+#line 738 "image.c"
 	}
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp3_, "green >= -255 && green <= 255");
@@ -809,17 +742,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp7_ = blue;
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp7_ >= -255) {
-#line 813 "image.c"
+#line 746 "image.c"
 		gint _tmp8_ = 0;
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp8_ = blue;
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp6_ = _tmp8_ <= 255;
-#line 819 "image.c"
+#line 752 "image.c"
 	} else {
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp6_ = FALSE;
-#line 823 "image.c"
+#line 756 "image.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp6_, "blue >= -255 && blue <= 255");
@@ -827,17 +760,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp10_ = alpha;
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp10_ >= -255) {
-#line 831 "image.c"
+#line 764 "image.c"
 		gint _tmp11_ = 0;
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp11_ = alpha;
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp9_ = _tmp11_ <= 255;
-#line 837 "image.c"
+#line 770 "image.c"
 	} else {
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp9_ = FALSE;
-#line 841 "image.c"
+#line 774 "image.c"
 	}
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp9_, "alpha >= -255 && alpha <= 255");
@@ -887,19 +820,19 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp26_ = gdk_pixbuf_get_bits_per_sample (_tmp25_);
 #line 230 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp26_ == 8, "pixbuf.get_bits_per_sample() == 8");
-#line 891 "image.c"
+#line 824 "image.c"
 	{
 		gint y = 0;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 		y = 0;
-#line 896 "image.c"
+#line 829 "image.c"
 		{
 			gboolean _tmp27_ = FALSE;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 			_tmp27_ = TRUE;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 			while (TRUE) {
-#line 903 "image.c"
+#line 836 "image.c"
 				gint _tmp29_ = 0;
 				gint _tmp30_ = 0;
 				gint y_offset = 0;
@@ -907,13 +840,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 				gint _tmp32_ = 0;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 				if (!_tmp27_) {
-#line 911 "image.c"
+#line 844 "image.c"
 					gint _tmp28_ = 0;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp28_ = y;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 					y = _tmp28_ + 1;
-#line 917 "image.c"
+#line 850 "image.c"
 				}
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp27_ = FALSE;
@@ -925,7 +858,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 				if (!(_tmp29_ < _tmp30_)) {
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 					break;
-#line 929 "image.c"
+#line 862 "image.c"
 				}
 #line 233 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp31_ = y;
@@ -933,19 +866,19 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 				_tmp32_ = rowstride;
 #line 233 "/home/jens/Source/shotwell/src/util/image.vala"
 				y_offset = _tmp31_ * _tmp32_;
-#line 937 "image.c"
+#line 870 "image.c"
 				{
 					gint x = 0;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 					x = 0;
-#line 942 "image.c"
+#line 875 "image.c"
 					{
 						gboolean _tmp33_ = FALSE;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 						_tmp33_ = TRUE;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 						while (TRUE) {
-#line 949 "image.c"
+#line 882 "image.c"
 							gint _tmp35_ = 0;
 							gint _tmp36_ = 0;
 							gint offset = 0;
@@ -959,13 +892,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 							gint _tmp68_ = 0;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (!_tmp33_) {
-#line 963 "image.c"
+#line 896 "image.c"
 								gint _tmp34_ = 0;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp34_ = x;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 								x = _tmp34_ + 1;
-#line 969 "image.c"
+#line 902 "image.c"
 							}
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp33_ = FALSE;
@@ -977,7 +910,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 							if (!(_tmp35_ < _tmp36_)) {
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 								break;
-#line 981 "image.c"
+#line 914 "image.c"
 							}
 #line 236 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp37_ = y_offset;
@@ -991,7 +924,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 							_tmp40_ = red;
 #line 238 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp40_ != 0) {
-#line 995 "image.c"
+#line 928 "image.c"
 								guchar* _tmp41_ = NULL;
 								gint _tmp42_ = 0;
 								guchar* _tmp43_ = NULL;
@@ -1018,13 +951,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 								_tmp41_[_tmp42_] = _tmp47_;
 #line 239 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp48_ = _tmp41_[_tmp42_];
-#line 1022 "image.c"
+#line 955 "image.c"
 							}
 #line 241 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp49_ = green;
 #line 241 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp49_ != 0) {
-#line 1028 "image.c"
+#line 961 "image.c"
 								guchar* _tmp50_ = NULL;
 								gint _tmp51_ = 0;
 								guchar* _tmp52_ = NULL;
@@ -1051,13 +984,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 								_tmp50_[_tmp51_ + 1] = _tmp56_;
 #line 242 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp57_ = _tmp50_[_tmp51_ + 1];
-#line 1055 "image.c"
+#line 988 "image.c"
 							}
 #line 244 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp58_ = blue;
 #line 244 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp58_ != 0) {
-#line 1061 "image.c"
+#line 994 "image.c"
 								guchar* _tmp59_ = NULL;
 								gint _tmp60_ = 0;
 								guchar* _tmp61_ = NULL;
@@ -1084,27 +1017,27 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 								_tmp59_[_tmp60_ + 2] = _tmp65_;
 #line 245 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp66_ = _tmp59_[_tmp60_ + 2];
-#line 1088 "image.c"
+#line 1021 "image.c"
 							}
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp68_ = alpha;
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp68_ != 0) {
-#line 1094 "image.c"
+#line 1027 "image.c"
 								gint _tmp69_ = 0;
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp69_ = channels;
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp67_ = _tmp69_ >= 4;
-#line 1100 "image.c"
+#line 1033 "image.c"
 							} else {
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp67_ = FALSE;
-#line 1104 "image.c"
+#line 1037 "image.c"
 							}
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp67_) {
-#line 1108 "image.c"
+#line 1041 "image.c"
 								guchar* _tmp70_ = NULL;
 								gint _tmp71_ = 0;
 								guchar* _tmp72_ = NULL;
@@ -1131,7 +1064,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 								_tmp70_[_tmp71_ + 3] = _tmp76_;
 #line 248 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp77_ = _tmp70_[_tmp71_ + 3];
-#line 1135 "image.c"
+#line 1068 "image.c"
 							}
 						}
 					}
@@ -1142,41 +1075,6 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 }
 
 
-void dim_pixbuf (GdkPixbuf* pixbuf) {
-	PixelTransformer* transformer = NULL;
-	PixelTransformer* _tmp0_ = NULL;
-	SaturationTransformation* sat = NULL;
-	SaturationTransformation* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-#line 253 "/home/jens/Source/shotwell/src/util/image.vala"
-	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
-	_tmp0_ = pixel_transformer_new ();
-#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
-	transformer = _tmp0_;
-#line 255 "/home/jens/Source/shotwell/src/util/image.vala"
-	_tmp1_ = saturation_transformation_new (SATURATION_TRANSFORMATION_MIN_PARAMETER);
-#line 255 "/home/jens/Source/shotwell/src/util/image.vala"
-	sat = _tmp1_;
-#line 256 "/home/jens/Source/shotwell/src/util/image.vala"
-	pixel_transformer_attach_transformation (transformer, G_TYPE_CHECK_INSTANCE_CAST (sat, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 257 "/home/jens/Source/shotwell/src/util/image.vala"
-	_tmp2_ = pixbuf;
-#line 257 "/home/jens/Source/shotwell/src/util/image.vala"
-	pixel_transformer_transform_pixbuf (transformer, _tmp2_, NULL);
-#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
-	_tmp3_ = pixbuf;
-#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
-	shift_colors (_tmp3_, 0, 0, 0, -100);
-#line 253 "/home/jens/Source/shotwell/src/util/image.vala"
-	_pixel_transformation_unref0 (sat);
-#line 253 "/home/jens/Source/shotwell/src/util/image.vala"
-	_pixel_transformer_unref0 (transformer);
-#line 1177 "image.c"
-}
-
-
 gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
@@ -1185,91 +1083,91 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 	gint _tmp3_ = 0;
 	GdkRectangle _tmp4_ = {0};
 	gint _tmp5_ = 0;
-#line 261 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (rect != NULL, FALSE);
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = x;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_ = *rect;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp5_ = _tmp4_.x;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp3_ >= _tmp5_) {
-#line 1199 "image.c"
+#line 1097 "image.c"
 		gint _tmp6_ = 0;
 		GdkRectangle _tmp7_ = {0};
 		gint _tmp8_ = 0;
 		GdkRectangle _tmp9_ = {0};
 		gint _tmp10_ = 0;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp6_ = x;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp7_ = *rect;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp8_ = _tmp7_.x;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp9_ = *rect;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp10_ = _tmp9_.width;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = _tmp6_ < (_tmp8_ + _tmp10_);
-#line 1217 "image.c"
+#line 1115 "image.c"
 	} else {
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = FALSE;
-#line 1221 "image.c"
+#line 1119 "image.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
-#line 1225 "image.c"
+#line 1123 "image.c"
 		gint _tmp11_ = 0;
 		GdkRectangle _tmp12_ = {0};
 		gint _tmp13_ = 0;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp11_ = y;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp12_ = *rect;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp13_ = _tmp12_.y;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = _tmp11_ >= _tmp13_;
-#line 1237 "image.c"
+#line 1135 "image.c"
 	} else {
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = FALSE;
-#line 1241 "image.c"
+#line 1139 "image.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_) {
-#line 1245 "image.c"
+#line 1143 "image.c"
 		gint _tmp14_ = 0;
 		GdkRectangle _tmp15_ = {0};
 		gint _tmp16_ = 0;
 		GdkRectangle _tmp17_ = {0};
 		gint _tmp18_ = 0;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp14_ = y;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp15_ = *rect;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp16_ = _tmp15_.y;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp17_ = *rect;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp18_ = _tmp17_.height;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = _tmp14_ <= (_tmp16_ + _tmp18_);
-#line 1263 "image.c"
+#line 1161 "image.c"
 	} else {
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = FALSE;
-#line 1267 "image.c"
+#line 1165 "image.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	result = _tmp0_;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 1273 "image.c"
+#line 1171 "image.c"
 }
 
 
@@ -1282,92 +1180,92 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 	gint _tmp4_ = 0;
 	GdkRectangle _tmp5_ = {0};
 	gint _tmp6_ = 0;
-#line 265 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 257 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (a != NULL, FALSE);
-#line 265 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 257 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (b != NULL, FALSE);
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = *a;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_ = _tmp3_.x;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp5_ = *b;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp6_ = _tmp5_.x;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ == _tmp6_) {
-#line 1300 "image.c"
+#line 1198 "image.c"
 		GdkRectangle _tmp7_ = {0};
 		gint _tmp8_ = 0;
 		GdkRectangle _tmp9_ = {0};
 		gint _tmp10_ = 0;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp7_ = *a;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp8_ = _tmp7_.y;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp9_ = *b;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp10_ = _tmp9_.y;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = _tmp8_ == _tmp10_;
-#line 1315 "image.c"
+#line 1213 "image.c"
 	} else {
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = FALSE;
-#line 1319 "image.c"
+#line 1217 "image.c"
 	}
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
-#line 1323 "image.c"
+#line 1221 "image.c"
 		GdkRectangle _tmp11_ = {0};
 		gint _tmp12_ = 0;
 		GdkRectangle _tmp13_ = {0};
 		gint _tmp14_ = 0;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp11_ = *a;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp12_ = _tmp11_.width;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp13_ = *b;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp14_ = _tmp13_.width;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = _tmp12_ == _tmp14_;
-#line 1338 "image.c"
+#line 1236 "image.c"
 	} else {
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = FALSE;
-#line 1342 "image.c"
+#line 1240 "image.c"
 	}
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_) {
-#line 1346 "image.c"
+#line 1244 "image.c"
 		GdkRectangle _tmp15_ = {0};
 		gint _tmp16_ = 0;
 		GdkRectangle _tmp17_ = {0};
 		gint _tmp18_ = 0;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp15_ = *a;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp16_ = _tmp15_.height;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp17_ = *b;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp18_ = _tmp17_.height;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = _tmp16_ == _tmp18_;
-#line 1361 "image.c"
+#line 1259 "image.c"
 	} else {
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = FALSE;
-#line 1365 "image.c"
+#line 1263 "image.c"
 	}
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	result = _tmp0_;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 1371 "image.c"
+#line 1269 "image.c"
 }
 
 
@@ -1382,31 +1280,31 @@ gchar* rectangle_to_string (GdkRectangle* rect) {
 	GdkRectangle _tmp6_ = {0};
 	gint _tmp7_ = 0;
 	gchar* _tmp8_ = NULL;
-#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 261 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (rect != NULL, NULL);
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_ = *rect;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp1_ = _tmp0_.x;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp2_ = *rect;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = _tmp2_.y;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_ = *rect;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp5_ = _tmp4_.width;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp6_ = *rect;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp7_ = _tmp6_.height;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp8_ = g_strdup_printf ("%d,%d %dx%d", _tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	result = _tmp8_;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 1410 "image.c"
+#line 1308 "image.c"
 }
 
 
@@ -1432,65 +1330,65 @@ void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* res
 	Dimensions _tmp17_ = {0};
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
-#line 273 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 265 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (original != NULL);
-#line 273 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 265 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (max != NULL);
-#line 274 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
 	memset (&rect, 0, sizeof (GdkRectangle));
-#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_ = *original;
-#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp1_ = _tmp0_.x;
-#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp2_ = *max;
-#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = _tmp2_.width;
-#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_ = CLAMP (_tmp1_, 0, _tmp3_);
-#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
 	rect.x = _tmp4_;
-#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp5_ = *original;
-#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp6_ = _tmp5_.y;
-#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp7_ = *max;
-#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp8_ = _tmp7_.height;
-#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp9_ = CLAMP (_tmp6_, 0, _tmp8_);
-#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
 	rect.y = _tmp9_;
-#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp10_ = *original;
-#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp11_ = _tmp10_.width;
-#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp12_ = *max;
-#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp13_ = _tmp12_.width;
-#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp14_ = CLAMP (_tmp11_, 0, _tmp13_);
-#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
 	rect.width = _tmp14_;
-#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp15_ = *original;
-#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp16_ = _tmp15_.height;
-#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp17_ = *max;
-#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp18_ = _tmp17_.height;
-#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp19_ = CLAMP (_tmp16_, 0, _tmp18_);
-#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
 	rect.height = _tmp19_;
-#line 280 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 272 "/home/jens/Source/shotwell/src/util/image.vala"
 	*result = rect;
-#line 280 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 272 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 1494 "image.c"
+#line 1392 "image.c"
 }
 
 
@@ -1503,33 +1401,33 @@ void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) {
 	gdouble _tmp4_ = 0.0;
 	GdkPoint _tmp5_ = {0};
 	gint _tmp6_ = 0;
-#line 283 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (p != NULL);
-#line 284 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_.x = 0;
-#line 284 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
 	_result_ = _tmp0_;
-#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp1_ = factor;
-#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp2_ = *p;
-#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = _tmp2_.x;
-#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
 	_result_.x = (gint) ((_tmp1_ * _tmp3_) + 0.5);
-#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_ = factor;
-#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp5_ = *p;
-#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp6_ = _tmp5_.y;
-#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
 	_result_.y = (gint) ((_tmp4_ * _tmp6_) + 0.5);
-#line 288 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 280 "/home/jens/Source/shotwell/src/util/image.vala"
 	*result = _result_;
-#line 288 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 280 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 1533 "image.c"
+#line 1431 "image.c"
 }
 
 
@@ -1544,39 +1442,39 @@ void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 	gint _tmp6_ = 0;
 	GdkPoint _tmp7_ = {0};
 	gint _tmp8_ = 0;
-#line 291 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 283 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (p1 != NULL);
-#line 291 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 283 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (p2 != NULL);
-#line 292 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 284 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_.x = 0;
-#line 292 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 284 "/home/jens/Source/shotwell/src/util/image.vala"
 	_result_ = _tmp0_;
-#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp1_ = *p1;
-#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp2_ = _tmp1_.x;
-#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = *p2;
-#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_ = _tmp3_.x;
-#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
 	_result_.x = _tmp2_ + _tmp4_;
-#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp5_ = *p1;
-#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp6_ = _tmp5_.y;
-#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp7_ = *p2;
-#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp8_ = _tmp7_.y;
-#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
 	_result_.y = _tmp6_ + _tmp8_;
-#line 296 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 288 "/home/jens/Source/shotwell/src/util/image.vala"
 	*result = _result_;
-#line 296 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 288 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 1580 "image.c"
+#line 1478 "image.c"
 }
 
 
@@ -1591,39 +1489,39 @@ void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 	gint _tmp6_ = 0;
 	GdkPoint _tmp7_ = {0};
 	gint _tmp8_ = 0;
-#line 299 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 291 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (p1 != NULL);
-#line 299 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 291 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (p2 != NULL);
-#line 300 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 292 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_.x = 0;
-#line 300 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 292 "/home/jens/Source/shotwell/src/util/image.vala"
 	_result_ = _tmp0_;
-#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp1_ = *p1;
-#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp2_ = _tmp1_.x;
-#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = *p2;
-#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_ = _tmp3_.x;
-#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
 	_result_.x = _tmp2_ - _tmp4_;
-#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp5_ = *p1;
-#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp6_ = _tmp5_.y;
-#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp7_ = *p2;
-#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp8_ = _tmp7_.y;
-#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
 	_result_.y = _tmp6_ - _tmp8_;
-#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 296 "/home/jens/Source/shotwell/src/util/image.vala"
 	*result = _result_;
-#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 296 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 1627 "image.c"
+#line 1525 "image.c"
 }
 
 
@@ -1632,29 +1530,29 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 	GdkPixbuf* _tmp0_ = NULL;
 	void* _tmp1_ = NULL;
 	void* _tmp2_ = NULL;
-#line 308 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 300 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_ = pixbuf;
-#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp1_ = gdk_pixbuf_get_pixels (_tmp0_);
-#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp2_ = _tmp1_;
-#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
 	gdk_pixels = _tmp2_;
-#line 1646 "image.c"
+#line 1544 "image.c"
 	{
 		gint j = 0;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 		j = 0;
-#line 1651 "image.c"
+#line 1549 "image.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 			_tmp3_ = TRUE;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 			while (TRUE) {
-#line 1658 "image.c"
+#line 1556 "image.c"
 				gint _tmp5_ = 0;
 				GdkPixbuf* _tmp6_ = NULL;
 				gint _tmp7_ = 0;
@@ -1670,49 +1568,49 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 				GdkPixbuf* _tmp27_ = NULL;
 				gint _tmp28_ = 0;
 				gint _tmp29_ = 0;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 				if (!_tmp3_) {
-#line 1676 "image.c"
+#line 1574 "image.c"
 					gint _tmp4_ = 0;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp4_ = j;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 					j = _tmp4_ + 1;
-#line 1682 "image.c"
+#line 1580 "image.c"
 				}
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp3_ = FALSE;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp5_ = j;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp6_ = pixbuf;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp7_ = gdk_pixbuf_get_height (_tmp6_);
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp8_ = _tmp7_;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 				if (!(_tmp5_ < _tmp8_)) {
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 					break;
-#line 1698 "image.c"
+#line 1596 "image.c"
 				}
-#line 311 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 303 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp9_ = gdk_pixels;
-#line 311 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 303 "/home/jens/Source/shotwell/src/util/image.vala"
 				p = _tmp9_;
-#line 312 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp10_ = p;
-#line 312 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp11_ = pixbuf;
-#line 312 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp12_ = gdk_pixbuf_get_width (_tmp11_);
-#line 312 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp13_ = _tmp12_;
-#line 312 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
 				end = _tmp10_ + (4 * _tmp13_);
-#line 314 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
 				while (TRUE) {
-#line 1716 "image.c"
+#line 1614 "image.c"
 					guchar* _tmp14_ = NULL;
 					guchar* _tmp15_ = NULL;
 					guchar tmp = '\0';
@@ -1726,57 +1624,57 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 					guchar _tmp23_ = '\0';
 					guchar _tmp24_ = '\0';
 					guchar* _tmp25_ = NULL;
-#line 314 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp14_ = p;
-#line 314 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp15_ = end;
-#line 314 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
 					if (!(_tmp14_ < _tmp15_)) {
-#line 314 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
 						break;
-#line 1738 "image.c"
+#line 1636 "image.c"
 					}
-#line 315 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp16_ = p;
-#line 315 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp17_ = _tmp16_[0];
-#line 315 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/image.vala"
 					tmp = _tmp17_;
-#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp18_ = p;
-#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp19_ = p;
-#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp20_ = _tmp19_[2];
-#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp18_[0] = _tmp20_;
-#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp21_ = _tmp18_[0];
-#line 318 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp22_ = p;
-#line 318 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp23_ = tmp;
-#line 318 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp22_[2] = _tmp23_;
-#line 318 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp24_ = _tmp22_[2];
-#line 325 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp25_ = p;
-#line 325 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
 					p = _tmp25_ + 4;
-#line 1768 "image.c"
+#line 1666 "image.c"
 				}
-#line 328 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp26_ = gdk_pixels;
-#line 328 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp27_ = pixbuf;
-#line 328 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp28_ = gdk_pixbuf_get_rowstride (_tmp27_);
-#line 328 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp29_ = _tmp28_;
-#line 328 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
 				gdk_pixels = _tmp26_ + _tmp29_;
-#line 1780 "image.c"
+#line 1678 "image.c"
 			}
 		}
 	}
@@ -1812,57 +1710,57 @@ void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble an
 	gdouble _tmp13_ = 0.0;
 	gdouble _tmp14_ = 0.0;
 	gdouble _tmp15_ = 0.0;
-#line 345 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_ = angle;
-#line 345 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp1_ = degrees_to_radians (_tmp0_);
-#line 345 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp2_ = fabs (_tmp1_);
-#line 345 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
 	angle = _tmp2_;
-#line 346 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 338 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = angle;
-#line 346 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 338 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp3_ <= G_PI_2, "angle <= Math.PI_2");
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_ = src_width;
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp5_ = angle;
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp6_ = cos (_tmp5_);
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp7_ = src_height;
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp8_ = angle;
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp9_ = sin (_tmp8_);
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_dest_width = (_tmp4_ * _tmp6_) + (_tmp7_ * _tmp9_);
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp10_ = src_height;
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp11_ = angle;
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp12_ = cos (_tmp11_);
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp13_ = src_width;
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp14_ = angle;
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp15_ = sin (_tmp14_);
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_dest_height = (_tmp10_ * _tmp12_) + (_tmp13_ * _tmp15_);
-#line 342 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 334 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (dest_width) {
-#line 342 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 334 "/home/jens/Source/shotwell/src/util/image.vala"
 		*dest_width = _vala_dest_width;
-#line 1860 "image.c"
+#line 1758 "image.c"
 	}
-#line 342 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 334 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (dest_height) {
-#line 342 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 334 "/home/jens/Source/shotwell/src/util/image.vala"
 		*dest_height = _vala_dest_height;
-#line 1866 "image.c"
+#line 1764 "image.c"
 	}
 }
 
@@ -1946,200 +1844,200 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
 	cairo_pattern_t* _tmp65_ = NULL;
 	cairo_t* _tmp66_ = NULL;
 	GdkPixbuf* _tmp67_ = NULL;
-#line 357 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 349 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (source_pixbuf), NULL);
-#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 353 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_ = angle;
-#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 353 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp0_ == 0.0) {
-#line 1956 "image.c"
+#line 1854 "image.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
-#line 362 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = source_pixbuf;
-#line 362 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 362 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
 		result = _tmp2_;
-#line 362 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
 		return result;
-#line 1967 "image.c"
+#line 1865 "image.c"
 	}
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = source_pixbuf;
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_ = gdk_pixbuf_get_width (_tmp3_);
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp5_ = _tmp4_;
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp6_ = source_pixbuf;
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp7_ = gdk_pixbuf_get_height (_tmp6_);
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp8_ = _tmp7_;
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp9_ = angle;
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
 	compute_arb_rotated_size ((gdouble) _tmp5_, (gdouble) _tmp8_, _tmp9_, &_tmp10_, &_tmp11_);
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
 	x_tmp = _tmp10_;
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
 	y_tmp = _tmp11_;
-#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp12_ = x_tmp;
-#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp13_ = round (_tmp12_);
-#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp14_ = y_tmp;
-#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp15_ = round (_tmp14_);
-#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp16_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, (gint) _tmp13_, (gint) _tmp15_);
-#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
 	dest_pixbuf = _tmp16_;
-#line 377 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp18_ = source_pixbuf;
-#line 377 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp19_ = gdk_pixbuf_get_has_alpha (_tmp18_);
-#line 377 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp20_ = _tmp19_;
-#line 377 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp20_) {
-#line 377 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp17_ = CAIRO_FORMAT_ARGB32;
-#line 2011 "image.c"
+#line 1909 "image.c"
 	} else {
-#line 377 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp17_ = CAIRO_FORMAT_RGB24;
-#line 2015 "image.c"
+#line 1913 "image.c"
 	}
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp21_ = dest_pixbuf;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp22_ = gdk_pixbuf_get_pixels (_tmp21_);
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp23_ = _tmp22_;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp24_ = dest_pixbuf;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp25_ = gdk_pixbuf_get_width (_tmp24_);
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp26_ = _tmp25_;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp27_ = dest_pixbuf;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp28_ = gdk_pixbuf_get_height (_tmp27_);
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp29_ = _tmp28_;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp30_ = dest_pixbuf;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp31_ = gdk_pixbuf_get_rowstride (_tmp30_);
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp32_ = _tmp31_;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp33_ = cairo_image_surface_create_for_data ((guchar*) _tmp23_, _tmp17_, _tmp26_, _tmp29_, _tmp32_);
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	surface = _tmp33_;
-#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp34_ = surface;
-#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp35_ = cairo_create (_tmp34_);
-#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
 	context = _tmp35_;
-#line 382 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 374 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp36_ = context;
-#line 382 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 374 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_set_source_rgb (_tmp36_, (gdouble) 0, (gdouble) 0, (gdouble) 0);
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp37_ = context;
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp38_ = dest_pixbuf;
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp39_ = gdk_pixbuf_get_width (_tmp38_);
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp40_ = _tmp39_;
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp41_ = dest_pixbuf;
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp42_ = gdk_pixbuf_get_height (_tmp41_);
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp43_ = _tmp42_;
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_rectangle (_tmp37_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp40_, (gdouble) _tmp43_);
-#line 384 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 376 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp44_ = context;
-#line 384 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 376 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_fill (_tmp44_);
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp45_ = context;
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp46_ = dest_pixbuf;
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp47_ = gdk_pixbuf_get_width (_tmp46_);
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp48_ = _tmp47_;
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp49_ = dest_pixbuf;
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp50_ = gdk_pixbuf_get_height (_tmp49_);
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp51_ = _tmp50_;
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_translate (_tmp45_, (gdouble) (_tmp48_ / 2), (gdouble) (_tmp51_ / 2));
-#line 387 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 379 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp52_ = context;
-#line 387 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 379 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp53_ = angle;
-#line 387 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 379 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp54_ = degrees_to_radians (_tmp53_);
-#line 387 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 379 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_rotate (_tmp52_, _tmp54_);
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp55_ = context;
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp56_ = source_pixbuf;
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp57_ = gdk_pixbuf_get_width (_tmp56_);
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp58_ = _tmp57_;
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp59_ = source_pixbuf;
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp60_ = gdk_pixbuf_get_height (_tmp59_);
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp61_ = _tmp60_;
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_translate (_tmp55_, (gdouble) ((-_tmp58_) / 2), (gdouble) ((-_tmp61_) / 2));
-#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 382 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp62_ = context;
-#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 382 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp63_ = source_pixbuf;
-#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 382 "/home/jens/Source/shotwell/src/util/image.vala"
 	gdk_cairo_set_source_pixbuf (_tmp62_, _tmp63_, (gdouble) 0, (gdouble) 0);
-#line 391 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp64_ = context;
-#line 391 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp65_ = cairo_get_source (_tmp64_);
-#line 391 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_pattern_set_filter (_tmp65_, CAIRO_FILTER_BEST);
-#line 392 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 384 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp66_ = context;
-#line 392 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 384 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_paint (_tmp66_);
-#line 396 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp67_ = dest_pixbuf;
-#line 396 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
 	fix_cairo_pixbuf (_tmp67_);
-#line 398 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
 	result = dest_pixbuf;
-#line 398 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
 	_cairo_destroy0 (context);
-#line 398 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
 	_cairo_surface_destroy0 (surface);
-#line 398 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 2143 "image.c"
+#line 2041 "image.c"
 }
 
 
@@ -2182,93 +2080,93 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
 	gdouble _tmp19_ = 0.0;
 	gdouble _tmp20_ = 0.0;
 	GdkPoint _tmp21_ = {0};
-#line 414 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 406 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (source_point != NULL);
-#line 417 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 409 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_ = angle;
-#line 417 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 409 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp0_ == 0.0) {
-#line 2192 "image.c"
+#line 2090 "image.c"
 		GdkPoint _tmp1_ = {0};
-#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 411 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = *source_point;
-#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 411 "/home/jens/Source/shotwell/src/util/image.vala"
 		*result = _tmp1_;
-#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 411 "/home/jens/Source/shotwell/src/util/image.vala"
 		return;
-#line 2200 "image.c"
+#line 2098 "image.c"
 	}
-#line 424 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp2_ = img_w;
-#line 424 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = img_h;
-#line 424 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_ = angle;
-#line 424 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
 	compute_arb_rotated_size ((gdouble) _tmp2_, (gdouble) _tmp3_, _tmp4_, &_tmp5_, &_tmp6_);
-#line 424 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
 	dest_width = _tmp5_;
-#line 424 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
 	dest_height = _tmp6_;
-#line 426 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 418 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_matrix_init_identity (&matrix);
-#line 427 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp7_ = dest_width;
-#line 427 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp8_ = dest_height;
-#line 427 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_matrix_translate (&matrix, _tmp7_ / 2, _tmp8_ / 2);
-#line 428 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 420 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp9_ = angle;
-#line 428 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 420 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp10_ = degrees_to_radians (_tmp9_);
-#line 428 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 420 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_matrix_rotate (&matrix, _tmp10_);
-#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 421 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp11_ = img_w;
-#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 421 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp12_ = img_h;
-#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 421 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_matrix_translate (&matrix, (gdouble) ((-_tmp11_) / 2), (gdouble) ((-_tmp12_) / 2));
-#line 430 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 422 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp13_ = invert;
-#line 430 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 422 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp13_) {
-#line 2238 "image.c"
+#line 2136 "image.c"
 		cairo_status_t _tmp14_ = 0;
-#line 431 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 423 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp14_ = cairo_matrix_invert (&matrix);
-#line 431 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 423 "/home/jens/Source/shotwell/src/util/image.vala"
 		_vala_assert (_tmp14_ == CAIRO_STATUS_SUCCESS, "matrix.invert() == Cairo.Status.SUCCESS");
-#line 2244 "image.c"
+#line 2142 "image.c"
 	}
-#line 433 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 425 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp15_ = *source_point;
-#line 433 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 425 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp16_ = _tmp15_.x;
-#line 433 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 425 "/home/jens/Source/shotwell/src/util/image.vala"
 	dest_x = (gdouble) _tmp16_;
-#line 434 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 426 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp17_ = *source_point;
-#line 434 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 426 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp18_ = _tmp17_.y;
-#line 434 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 426 "/home/jens/Source/shotwell/src/util/image.vala"
 	dest_y = (gdouble) _tmp18_;
-#line 435 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 427 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_matrix_transform_point (&matrix, &dest_x, &dest_y);
-#line 437 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp19_ = dest_x;
-#line 437 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp20_ = dest_y;
-#line 437 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp21_.x = (gint) _tmp19_;
-#line 437 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp21_.y = (gint) _tmp20_;
-#line 437 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
 	*result = _tmp21_;
-#line 437 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 2272 "image.c"
+#line 2170 "image.c"
 }
 
 
@@ -2291,23 +2189,23 @@ void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble
 	gint _tmp2_ = 0;
 	gdouble _tmp3_ = 0.0;
 	GdkPoint _tmp4_ = {0};
-#line 453 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 445 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (source_point != NULL);
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_ = *source_point;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp1_ = img_w;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp2_ = img_h;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = angle;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
 	rotate_point_arb (&_tmp0_, _tmp1_, _tmp2_, _tmp3_, TRUE, &_tmp4_);
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
 	*result = _tmp4_;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 2311 "image.c"
+#line 2209 "image.c"
 }
 
 
@@ -2391,263 +2289,263 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 	gint _tmp73_ = 0;
 	Box _tmp78_ = {0};
 	gboolean _tmp79_ = FALSE;
-#line 459 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 451 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (src != NULL);
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_ = *src;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp1_ = _tmp0_.left;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp2_ = *src;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = _tmp2_.top;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_.x = _tmp1_;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_.y = _tmp3_;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp5_ = img_w;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp6_ = img_h;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp7_ = angle_deg;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
 	derotate_point_arb (&_tmp4_, _tmp5_, _tmp6_, _tmp7_, &_tmp8_);
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
 	top_left = _tmp8_;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp9_ = *src;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp10_ = _tmp9_.right;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp11_ = *src;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp12_ = _tmp11_.top;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp13_.x = _tmp10_;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp13_.y = _tmp12_;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp14_ = img_w;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp15_ = img_h;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp16_ = angle_deg;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
 	derotate_point_arb (&_tmp13_, _tmp14_, _tmp15_, _tmp16_, &_tmp17_);
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
 	top_right = _tmp17_;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp18_ = *src;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp19_ = _tmp18_.left;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp20_ = *src;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp21_ = _tmp20_.bottom;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp22_.x = _tmp19_;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp22_.y = _tmp21_;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp23_ = img_w;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp24_ = img_h;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp25_ = angle_deg;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
 	derotate_point_arb (&_tmp22_, _tmp23_, _tmp24_, _tmp25_, &_tmp26_);
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
 	bottom_left = _tmp26_;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp27_ = *src;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp28_ = _tmp27_.right;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp29_ = *src;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp30_ = _tmp29_.bottom;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp31_.x = _tmp28_;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp31_.y = _tmp30_;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp32_ = img_w;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp33_ = img_h;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp34_ = angle_deg;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
 	derotate_point_arb (&_tmp31_, _tmp32_, _tmp33_, _tmp34_, &_tmp35_);
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
 	bottom_right = _tmp35_;
-#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 459 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp36_ = angle_deg;
-#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 459 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp37_ = degrees_to_radians (_tmp36_);
-#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 459 "/home/jens/Source/shotwell/src/util/image.vala"
 	angle = _tmp37_;
-#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
 	top_offset = 0;
-#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
 	bottom_offset = 0;
-#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
 	left_offset = 0;
-#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
 	right_offset = 0;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp38_ = top_left;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp39_ = _tmp38_.y;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp40_ = top_right;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp41_ = _tmp40_.y;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp42_ = MIN (_tmp39_, _tmp41_);
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
 	top = _tmp42_;
-#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp43_ = top;
-#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp43_ < 0) {
-#line 2515 "image.c"
+#line 2413 "image.c"
 		gint _tmp44_ = 0;
 		gdouble _tmp45_ = 0.0;
 		gdouble _tmp46_ = 0.0;
-#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp44_ = top;
-#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp45_ = angle;
-#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp46_ = cos (_tmp45_);
-#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
 		top_offset = (gint) ((0 - _tmp44_) * _tmp46_);
-#line 2527 "image.c"
+#line 2425 "image.c"
 	}
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp47_ = bottom_left;
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp48_ = _tmp47_.y;
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp49_ = bottom_right;
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp50_ = _tmp49_.y;
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp51_ = MAX (_tmp48_, _tmp50_);
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
 	bottom = _tmp51_;
-#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp52_ = bottom;
-#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp53_ = img_h;
-#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp52_ > _tmp53_) {
-#line 2547 "image.c"
+#line 2445 "image.c"
 		gint _tmp54_ = 0;
 		gint _tmp55_ = 0;
 		gdouble _tmp56_ = 0.0;
 		gdouble _tmp57_ = 0.0;
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp54_ = img_h;
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp55_ = bottom;
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp56_ = angle;
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp57_ = cos (_tmp56_);
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
 		bottom_offset = (gint) ((_tmp54_ - _tmp55_) * _tmp57_);
-#line 2562 "image.c"
+#line 2460 "image.c"
 	}
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp58_ = top_left;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp59_ = _tmp58_.x;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp60_ = bottom_left;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp61_ = _tmp60_.x;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp62_ = MIN (_tmp59_, _tmp61_);
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
 	left = _tmp62_;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp63_ = left;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp63_ < 0) {
-#line 2580 "image.c"
+#line 2478 "image.c"
 		gint _tmp64_ = 0;
 		gdouble _tmp65_ = 0.0;
 		gdouble _tmp66_ = 0.0;
-#line 480 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp64_ = left;
-#line 480 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp65_ = angle;
-#line 480 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp66_ = cos (_tmp65_);
-#line 480 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
 		left_offset = (gint) ((0 - _tmp64_) * _tmp66_);
-#line 2592 "image.c"
+#line 2490 "image.c"
 	}
-#line 482 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp67_ = top_right;
-#line 482 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp68_ = _tmp67_.x;
-#line 482 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp69_ = bottom_right;
-#line 482 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp70_ = _tmp69_.x;
-#line 482 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp71_ = MAX (_tmp68_, _tmp70_);
-#line 482 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
 	right = _tmp71_;
-#line 483 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp72_ = right;
-#line 483 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp73_ = img_w;
-#line 483 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp72_ > _tmp73_) {
-#line 2612 "image.c"
+#line 2510 "image.c"
 		gint _tmp74_ = 0;
 		gint _tmp75_ = 0;
 		gdouble _tmp76_ = 0.0;
 		gdouble _tmp77_ = 0.0;
-#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp74_ = img_w;
-#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp75_ = right;
-#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp76_ = angle;
-#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp77_ = cos (_tmp76_);
-#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
 		right_offset = (gint) ((_tmp74_ - _tmp75_) * _tmp77_);
-#line 2627 "image.c"
+#line 2525 "image.c"
 	}
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp79_ = preserve_geom;
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp79_) {
-#line 2633 "image.c"
+#line 2531 "image.c"
 		gint _tmp80_ = 0;
 		gint _tmp81_ = 0;
 		gint _tmp82_ = 0;
 		gint _tmp83_ = 0;
 		Box _tmp84_ = {0};
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp80_ = left_offset;
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp81_ = right_offset;
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp82_ = top_offset;
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp83_ = bottom_offset;
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 		box_get_offset (src, _tmp80_ + _tmp81_, _tmp82_ + _tmp83_, &_tmp84_);
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp78_ = _tmp84_;
-#line 2651 "image.c"
+#line 2549 "image.c"
 	} else {
 		Box _tmp85_ = {0};
 		gint _tmp86_ = 0;
@@ -2661,39 +2559,39 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 		Box _tmp94_ = {0};
 		gint _tmp95_ = 0;
 		gint _tmp96_ = 0;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp85_ = *src;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp86_ = _tmp85_.left;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp87_ = left_offset;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp88_ = *src;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp89_ = _tmp88_.top;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp90_ = top_offset;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp91_ = *src;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp92_ = _tmp91_.right;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp93_ = right_offset;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp94_ = *src;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp95_ = _tmp94_.bottom;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp96_ = bottom_offset;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		box_init (&_tmp78_, _tmp86_ + _tmp87_, _tmp89_ + _tmp90_, _tmp92_ + _tmp93_, _tmp95_ + _tmp96_);
-#line 2691 "image.c"
+#line 2589 "image.c"
 	}
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 	*result = _tmp78_;
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 2697 "image.c"
+#line 2595 "image.c"
 }
 
 
diff --git a/src/util/image.vala b/src/util/image.vala
index db872df..4adafae 100644
--- a/src/util/image.vala
+++ b/src/util/image.vala
@@ -250,14 +250,6 @@ public void shift_colors(Gdk.Pixbuf pixbuf, int red, int green, int blue, int al
     }
 }
 
-public void dim_pixbuf(Gdk.Pixbuf pixbuf) {
-    PixelTransformer transformer = new PixelTransformer();
-    SaturationTransformation sat = new SaturationTransformation(SaturationTransformation.MIN_PARAMETER);
-    transformer.attach_transformation(sat);
-    transformer.transform_pixbuf(pixbuf);
-    shift_colors(pixbuf, 0, 0, 0, -100);
-}
-
 bool coord_in_rectangle(int x, int y, Gdk.Rectangle rect) {
     return (x >= rect.x && x < (rect.x + rect.width) && y >= rect.y && y <= (rect.y + rect.height));
 }
diff --git a/src/util/misc.c b/src/util/misc.c
index b1a0d40..848194e 100644
--- a/src/util/misc.c
+++ b/src/util/misc.c
@@ -1,4 +1,4 @@
-/* misc.c generated by valac 0.34.2, the Vala compiler
+/* misc.c generated by valac 0.32.1, the Vala compiler
  * generated from misc.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -269,9 +269,6 @@ void op_timer_start (OpTimer* self);
 void op_timer_stop (OpTimer* self);
 gchar* op_timer_to_string (OpTimer* self);
 static void op_timer_finalize (OpTimer* obj);
-void suppress_warnings (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message);
-gboolean is_twentyfour_hr_time_system (void);
-gboolean is_string_empty (const gchar* s);
 
 
 guint int64_hash (gint64* n) {
@@ -285,32 +282,32 @@ guint int64_hash (gint64* n) {
 	u8 = (guint8*) _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/util/misc.vala"
 	hash = (guint) 0;
-#line 289 "misc.c"
+#line 286 "misc.c"
 	{
 		gint ctr = 0;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 		ctr = 0;
-#line 294 "misc.c"
+#line 291 "misc.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp1_ = TRUE;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 			while (TRUE) {
-#line 301 "misc.c"
+#line 298 "misc.c"
 				gint _tmp3_ = 0;
 				guint _tmp4_ = 0U;
 				guint _tmp5_ = 0U;
 				guint8* _tmp6_ = NULL;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (!_tmp1_) {
-#line 308 "misc.c"
+#line 305 "misc.c"
 					gint _tmp2_ = 0;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 					_tmp2_ = ctr;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 					ctr = _tmp2_ + 1;
-#line 314 "misc.c"
+#line 311 "misc.c"
 				}
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp1_ = FALSE;
@@ -320,7 +317,7 @@ guint int64_hash (gint64* n) {
 				if (!(((gulong) _tmp3_) < (sizeof (gint64) / sizeof (guint8)))) {
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 					break;
-#line 324 "misc.c"
+#line 321 "misc.c"
 				}
 #line 12 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp4_ = hash;
@@ -332,7 +329,7 @@ guint int64_hash (gint64* n) {
 				u8 = _tmp6_ + 1;
 #line 12 "/home/jens/Source/shotwell/src/util/misc.vala"
 				hash = ((_tmp4_ << 4) ^ (_tmp5_ >> 28)) ^ (*_tmp6_);
-#line 336 "misc.c"
+#line 333 "misc.c"
 			}
 		}
 	}
@@ -340,7 +337,7 @@ guint int64_hash (gint64* n) {
 	result = hash;
 #line 15 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 344 "misc.c"
+#line 341 "misc.c"
 }
 
 
@@ -362,7 +359,7 @@ gboolean int64_equal (gint64* a, gint64* b) {
 	result = (*bia) == (*bib);
 #line 22 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 366 "misc.c"
+#line 363 "misc.c"
 }
 
 
@@ -386,7 +383,7 @@ gint int64_compare (gint64* a, gint64* b) {
 		result = -1;
 #line 28 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 390 "misc.c"
+#line 387 "misc.c"
 	} else {
 		gint64 _tmp3_ = 0LL;
 #line 29 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -397,13 +394,13 @@ gint int64_compare (gint64* a, gint64* b) {
 			result = 1;
 #line 30 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return result;
-#line 401 "misc.c"
+#line 398 "misc.c"
 		} else {
 #line 32 "/home/jens/Source/shotwell/src/util/misc.vala"
 			result = 0;
 #line 32 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return result;
-#line 407 "misc.c"
+#line 404 "misc.c"
 		}
 	}
 }
@@ -435,7 +432,7 @@ gint uint64_compare (guint64* a, guint64* b) {
 		result = -1;
 #line 40 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 439 "misc.c"
+#line 436 "misc.c"
 	} else {
 		guint64 _tmp4_ = 0ULL;
 		guint64 _tmp5_ = 0ULL;
@@ -449,13 +446,13 @@ gint uint64_compare (guint64* a, guint64* b) {
 			result = 1;
 #line 42 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return result;
-#line 453 "misc.c"
+#line 450 "misc.c"
 		} else {
 #line 44 "/home/jens/Source/shotwell/src/util/misc.vala"
 			result = 0;
 #line 44 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return result;
-#line 459 "misc.c"
+#line 456 "misc.c"
 		}
 	}
 }
@@ -477,7 +474,7 @@ gboolean bool_value_equals (GValue* a, GValue* b) {
 	result = g_value_get_boolean (&_tmp0_) == g_value_get_boolean (&_tmp1_);
 #line 50 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 481 "misc.c"
+#line 478 "misc.c"
 }
 
 
@@ -497,7 +494,7 @@ gboolean int_value_equals (GValue* a, GValue* b) {
 	result = g_value_get_int (&_tmp0_) == g_value_get_int (&_tmp1_);
 #line 54 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 501 "misc.c"
+#line 498 "misc.c"
 }
 
 
@@ -521,7 +518,7 @@ gulong timeval_to_ms (GTimeVal* time_val) {
 	result = (((gulong) _tmp1_) * 1000) + (((gulong) _tmp3_) / 1000);
 #line 58 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 525 "misc.c"
+#line 522 "misc.c"
 }
 
 
@@ -537,7 +534,7 @@ gulong now_ms (void) {
 	result = _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 541 "misc.c"
+#line 538 "misc.c"
 }
 
 
@@ -556,7 +553,7 @@ gulong now_sec (void) {
 	result = (gulong) _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 560 "misc.c"
+#line 557 "misc.c"
 }
 
 
@@ -569,7 +566,7 @@ inline time_t now_time_t (void) {
 	result = (time_t) _tmp0_;
 #line 72 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 573 "misc.c"
+#line 570 "misc.c"
 }
 
 
@@ -606,7 +603,7 @@ gchar* md5_binary (guint8* buffer, gsize length) {
 	_g_checksum_free0 (md5);
 #line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 610 "misc.c"
+#line 607 "misc.c"
 }
 
 
@@ -655,7 +652,7 @@ gchar* md5_file (GFile* file, GError** error) {
 		_g_checksum_free0 (md5);
 #line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return NULL;
-#line 659 "misc.c"
+#line 656 "misc.c"
 	}
 	{
 		gboolean _tmp4_ = FALSE;
@@ -663,7 +660,7 @@ gchar* md5_file (GFile* file, GError** error) {
 		_tmp4_ = TRUE;
 #line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 667 "misc.c"
+#line 664 "misc.c"
 			gsize bytes_read = 0UL;
 			GFileInputStream* _tmp5_ = NULL;
 			guint8* _tmp6_ = NULL;
@@ -676,7 +673,7 @@ gchar* md5_file (GFile* file, GError** error) {
 			gsize _tmp11_ = 0UL;
 #line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (!_tmp4_) {
-#line 680 "misc.c"
+#line 677 "misc.c"
 			}
 #line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp4_ = FALSE;
@@ -687,7 +684,7 @@ gchar* md5_file (GFile* file, GError** error) {
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp6__length1 = buffer_length1;
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
-			_tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_);
+			_tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_INPUT_STREAM, GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_);
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
 			bytes_read = (gsize) _tmp7_;
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -702,7 +699,7 @@ gchar* md5_file (GFile* file, GError** error) {
 				_g_checksum_free0 (md5);
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
 				return NULL;
-#line 706 "misc.c"
+#line 703 "misc.c"
 			}
 #line 91 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp8_ = bytes_read;
@@ -710,7 +707,7 @@ gchar* md5_file (GFile* file, GError** error) {
 			if (_tmp8_ <= ((gsize) 0)) {
 #line 92 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 714 "misc.c"
+#line 711 "misc.c"
 			}
 #line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = md5;
@@ -722,7 +719,7 @@ gchar* md5_file (GFile* file, GError** error) {
 			_tmp11_ = bytes_read;
 #line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
 			g_checksum_update (_tmp9_, (guchar*) _tmp10_, _tmp11_);
-#line 726 "misc.c"
+#line 723 "misc.c"
 		}
 	}
 	{
@@ -730,10 +727,10 @@ gchar* md5_file (GFile* file, GError** error) {
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp12_ = fins;
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
-		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 737 "misc.c"
+#line 734 "misc.c"
 			goto __catch5_g_error;
 		}
 	}
@@ -766,7 +763,7 @@ gchar* md5_file (GFile* file, GError** error) {
 		_g_free0 (_tmp15_);
 #line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_error_free0 (err);
-#line 770 "misc.c"
+#line 767 "misc.c"
 	}
 	__finally5:
 #line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -781,7 +778,7 @@ gchar* md5_file (GFile* file, GError** error) {
 		_g_checksum_free0 (md5);
 #line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return NULL;
-#line 785 "misc.c"
+#line 782 "misc.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp18_ = md5;
@@ -799,7 +796,7 @@ gchar* md5_file (GFile* file, GError** error) {
 	_g_checksum_free0 (md5);
 #line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 803 "misc.c"
+#line 800 "misc.c"
 }
 
 
@@ -829,7 +826,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 	_tmp2_ = a;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp2_ != NULL) {
-#line 833 "misc.c"
+#line 830 "misc.c"
 		GeeSet* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		gint _tmp5_ = 0;
@@ -841,25 +838,25 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		_tmp5_ = _tmp4_;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = _tmp5_ == 0;
-#line 845 "misc.c"
+#line 842 "misc.c"
 	} else {
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = FALSE;
-#line 849 "misc.c"
+#line 846 "misc.c"
 	}
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_) {
-#line 853 "misc.c"
+#line 850 "misc.c"
 		GeeSet* _tmp6_ = NULL;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = b;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = _tmp6_ == NULL;
-#line 859 "misc.c"
+#line 856 "misc.c"
 	} else {
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = FALSE;
-#line 863 "misc.c"
+#line 860 "misc.c"
 	}
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_) {
@@ -867,20 +864,20 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		result = TRUE;
 #line 109 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 871 "misc.c"
+#line 868 "misc.c"
 	}
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp8_ = a;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp8_ == NULL) {
-#line 877 "misc.c"
+#line 874 "misc.c"
 		gboolean _tmp9_ = FALSE;
 		GeeSet* _tmp10_ = NULL;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp10_ = b;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp10_ != NULL) {
-#line 884 "misc.c"
+#line 881 "misc.c"
 			GeeSet* _tmp11_ = NULL;
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
@@ -892,19 +889,19 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 			_tmp13_ = _tmp12_;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = _tmp13_ == 0;
-#line 896 "misc.c"
+#line 893 "misc.c"
 		} else {
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = FALSE;
-#line 900 "misc.c"
+#line 897 "misc.c"
 		}
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp7_ = _tmp9_;
-#line 904 "misc.c"
+#line 901 "misc.c"
 	} else {
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp7_ = FALSE;
-#line 908 "misc.c"
+#line 905 "misc.c"
 	}
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp7_) {
@@ -912,29 +909,29 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		result = TRUE;
 #line 112 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 916 "misc.c"
+#line 913 "misc.c"
 	}
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp16_ = a;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp16_ == NULL) {
-#line 922 "misc.c"
+#line 919 "misc.c"
 		GeeSet* _tmp17_ = NULL;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp17_ = b;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp15_ = _tmp17_ != NULL;
-#line 928 "misc.c"
+#line 925 "misc.c"
 	} else {
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp15_ = FALSE;
-#line 932 "misc.c"
+#line 929 "misc.c"
 	}
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp15_) {
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp14_ = TRUE;
-#line 938 "misc.c"
+#line 935 "misc.c"
 	} else {
 		gboolean _tmp18_ = FALSE;
 		GeeSet* _tmp19_ = NULL;
@@ -942,21 +939,21 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		_tmp19_ = a;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp19_ != NULL) {
-#line 946 "misc.c"
+#line 943 "misc.c"
 			GeeSet* _tmp20_ = NULL;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp20_ = b;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp18_ = _tmp20_ == NULL;
-#line 952 "misc.c"
+#line 949 "misc.c"
 		} else {
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp18_ = FALSE;
-#line 956 "misc.c"
+#line 953 "misc.c"
 		}
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp14_ = _tmp18_;
-#line 960 "misc.c"
+#line 957 "misc.c"
 	}
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp14_) {
@@ -964,23 +961,23 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		result = FALSE;
 #line 115 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 968 "misc.c"
+#line 965 "misc.c"
 	}
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp22_ = a;
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp22_ == NULL) {
-#line 974 "misc.c"
+#line 971 "misc.c"
 		GeeSet* _tmp23_ = NULL;
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp23_ = b;
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp21_ = _tmp23_ == NULL;
-#line 980 "misc.c"
+#line 977 "misc.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp21_ = FALSE;
-#line 984 "misc.c"
+#line 981 "misc.c"
 	}
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp21_) {
@@ -988,7 +985,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		result = TRUE;
 #line 118 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 992 "misc.c"
+#line 989 "misc.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp24_ = a;
@@ -1008,7 +1005,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		result = FALSE;
 #line 121 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1012 "misc.c"
+#line 1009 "misc.c"
 	}
 	{
 		GeeIterator* _element_it = NULL;
@@ -1022,7 +1019,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		_element_it = _tmp31_;
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1026 "misc.c"
+#line 1023 "misc.c"
 			GeeIterator* _tmp32_ = NULL;
 			gboolean _tmp33_ = FALSE;
 			gchar* element = NULL;
@@ -1039,7 +1036,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 			if (!_tmp33_) {
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1043 "misc.c"
+#line 1040 "misc.c"
 			}
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp34_ = _element_it;
@@ -1063,28 +1060,28 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 				_g_object_unref0 (_element_it);
 #line 127 "/home/jens/Source/shotwell/src/util/misc.vala"
 				return result;
-#line 1067 "misc.c"
+#line 1064 "misc.c"
 			}
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (element);
-#line 1071 "misc.c"
+#line 1068 "misc.c"
 		}
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_element_it);
-#line 1075 "misc.c"
+#line 1072 "misc.c"
 	}
 #line 130 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = TRUE;
 #line 130 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1081 "misc.c"
+#line 1078 "misc.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1088 "misc.c"
+#line 1085 "misc.c"
 }
 
 
@@ -1111,27 +1108,27 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 	_tmp1_ = a;
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_ != NULL) {
-#line 1115 "misc.c"
+#line 1112 "misc.c"
 		GeeSet* _tmp2_ = NULL;
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp2_ = b;
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 1121 "misc.c"
+#line 1118 "misc.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = FALSE;
-#line 1125 "misc.c"
+#line 1122 "misc.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_) {
-#line 1129 "misc.c"
+#line 1126 "misc.c"
 		GeeSet* _tmp3_ = NULL;
 #line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = excluded;
 #line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp3_ != NULL) {
-#line 1135 "misc.c"
+#line 1132 "misc.c"
 			GeeSet* _tmp4_ = NULL;
 			GeeSet* _tmp5_ = NULL;
 #line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1140,39 +1137,39 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			_tmp5_ = a;
 #line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
 			gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1144 "misc.c"
+#line 1141 "misc.c"
 		}
 #line 140 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = NULL;
 #line 140 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1150 "misc.c"
+#line 1147 "misc.c"
 	}
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp7_ = a;
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp7_ == NULL) {
-#line 1156 "misc.c"
+#line 1153 "misc.c"
 		GeeSet* _tmp8_ = NULL;
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp8_ = b;
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = _tmp8_ != NULL;
-#line 1162 "misc.c"
+#line 1159 "misc.c"
 	} else {
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = FALSE;
-#line 1166 "misc.c"
+#line 1163 "misc.c"
 	}
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp6_) {
-#line 1170 "misc.c"
+#line 1167 "misc.c"
 		GeeSet* _tmp9_ = NULL;
 #line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp9_ = excluded;
 #line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp9_ != NULL) {
-#line 1176 "misc.c"
+#line 1173 "misc.c"
 			GeeSet* _tmp10_ = NULL;
 			GeeSet* _tmp11_ = NULL;
 #line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1181,19 +1178,19 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			_tmp11_ = b;
 #line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
 			gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1185 "misc.c"
+#line 1182 "misc.c"
 		}
 #line 147 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = NULL;
 #line 147 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1191 "misc.c"
+#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);
 #line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 	intersection = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_SET, GeeSet);
-#line 1197 "misc.c"
+#line 1194 "misc.c"
 	{
 		GeeIterator* _element_it = NULL;
 		GeeSet* _tmp13_ = NULL;
@@ -1206,7 +1203,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 		_element_it = _tmp14_;
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1210 "misc.c"
+#line 1207 "misc.c"
 			GeeIterator* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
 			gchar* element = NULL;
@@ -1223,7 +1220,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			if (!_tmp16_) {
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1227 "misc.c"
+#line 1224 "misc.c"
 			}
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp17_ = _element_it;
@@ -1239,7 +1236,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			_tmp21_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_);
 #line 153 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (_tmp21_) {
-#line 1243 "misc.c"
+#line 1240 "misc.c"
 				GeeSet* _tmp22_ = NULL;
 				const gchar* _tmp23_ = NULL;
 #line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1248,14 +1245,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 				_tmp23_ = element;
 #line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 1252 "misc.c"
+#line 1249 "misc.c"
 			} else {
 				GeeSet* _tmp24_ = NULL;
 #line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp24_ = excluded;
 #line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (_tmp24_ != NULL) {
-#line 1259 "misc.c"
+#line 1256 "misc.c"
 					GeeSet* _tmp25_ = NULL;
 					const gchar* _tmp26_ = NULL;
 #line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1264,16 +1261,16 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 					_tmp26_ = element;
 #line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_);
-#line 1268 "misc.c"
+#line 1265 "misc.c"
 				}
 			}
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (element);
-#line 1273 "misc.c"
+#line 1270 "misc.c"
 		}
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_element_it);
-#line 1277 "misc.c"
+#line 1274 "misc.c"
 	}
 	{
 		GeeIterator* _element_it = NULL;
@@ -1287,7 +1284,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 		_element_it = _tmp28_;
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1291 "misc.c"
+#line 1288 "misc.c"
 			GeeIterator* _tmp29_ = NULL;
 			gboolean _tmp30_ = FALSE;
 			gchar* element = NULL;
@@ -1304,7 +1301,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			if (!_tmp30_) {
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1308 "misc.c"
+#line 1305 "misc.c"
 			}
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp31_ = _element_it;
@@ -1320,7 +1317,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			_tmp35_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), _tmp34_);
 #line 160 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (_tmp35_) {
-#line 1324 "misc.c"
+#line 1321 "misc.c"
 				GeeSet* _tmp36_ = NULL;
 				const gchar* _tmp37_ = NULL;
 #line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1329,14 +1326,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 				_tmp37_ = element;
 #line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_);
-#line 1333 "misc.c"
+#line 1330 "misc.c"
 			} else {
 				GeeSet* _tmp38_ = NULL;
 #line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp38_ = excluded;
 #line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (_tmp38_ != NULL) {
-#line 1340 "misc.c"
+#line 1337 "misc.c"
 					GeeSet* _tmp39_ = NULL;
 					const gchar* _tmp40_ = NULL;
 #line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1345,16 +1342,16 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 					_tmp40_ = element;
 #line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), _tmp40_);
-#line 1349 "misc.c"
+#line 1346 "misc.c"
 				}
 			}
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (element);
-#line 1354 "misc.c"
+#line 1351 "misc.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_element_it);
-#line 1358 "misc.c"
+#line 1355 "misc.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp42_ = intersection;
@@ -1364,17 +1361,17 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 	_tmp44_ = _tmp43_;
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp44_ > 0) {
-#line 1368 "misc.c"
+#line 1365 "misc.c"
 		GeeSet* _tmp45_ = NULL;
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp45_ = intersection;
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp41_ = _tmp45_;
-#line 1374 "misc.c"
+#line 1371 "misc.c"
 	} else {
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp41_ = NULL;
-#line 1378 "misc.c"
+#line 1375 "misc.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp46_ = _g_object_ref0 (_tmp41_);
@@ -1384,7 +1381,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 	_g_object_unref0 (intersection);
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1388 "misc.c"
+#line 1385 "misc.c"
 }
 
 
@@ -1428,7 +1425,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 	_ids_size_ = ids_length1;
 #line 171 "/home/jens/Source/shotwell/src/util/misc.vala"
 	ctr = 0;
-#line 1432 "misc.c"
+#line 1429 "misc.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeCollection* _tmp4_ = NULL;
@@ -1441,7 +1438,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 		_photo_it = _tmp5_;
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1445 "misc.c"
+#line 1442 "misc.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			Photo* photo = NULL;
@@ -1462,7 +1459,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 			if (!_tmp7_) {
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1466 "misc.c"
+#line 1463 "misc.c"
 			}
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp8_ = _photo_it;
@@ -1490,11 +1487,11 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 			_tmp15_ = _tmp10_[_tmp11_];
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_object_unref0 (photo);
-#line 1494 "misc.c"
+#line 1491 "misc.c"
 		}
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_photo_it);
-#line 1498 "misc.c"
+#line 1495 "misc.c"
 	}
 #line 175 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp16_ = photos;
@@ -1526,7 +1523,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 	if (result_length1) {
 #line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*result_length1 = _tmp21__length1;
-#line 1530 "misc.c"
+#line 1527 "misc.c"
 	}
 #line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = _tmp21_;
@@ -1534,7 +1531,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 	ids = (g_free (ids), NULL);
 #line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1538 "misc.c"
+#line 1535 "misc.c"
 }
 
 
@@ -1567,14 +1564,14 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 	if (_tmp2_ <= ((gsize) 0)) {
 #line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = TRUE;
-#line 1571 "misc.c"
+#line 1568 "misc.c"
 	} else {
 		guchar* _tmp3_ = NULL;
 #line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = serialized;
 #line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 1578 "misc.c"
+#line 1575 "misc.c"
 	}
 #line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_) {
@@ -1582,7 +1579,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 		result = NULL;
 #line 185 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1586 "misc.c"
+#line 1583 "misc.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp4_ = count;
@@ -1612,7 +1609,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 	_tmp10_ = ids;
 #line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp10__length1 = ids_length1;
-#line 1616 "misc.c"
+#line 1613 "misc.c"
 	{
 		gint64* id_collection = NULL;
 		gint id_collection_length1 = 0;
@@ -1624,11 +1621,11 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 		id_collection_length1 = _tmp10__length1;
 #line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 		for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) {
-#line 1628 "misc.c"
+#line 1625 "misc.c"
 			gint64 id = 0LL;
 #line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 			id = id_collection[id_it];
-#line 1632 "misc.c"
+#line 1629 "misc.c"
 			{
 				GeeArrayList* _tmp11_ = NULL;
 				gint64 _tmp12_ = 0LL;
@@ -1641,7 +1638,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 				photo_id_init (&_tmp13_, _tmp12_);
 #line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp13_);
-#line 1645 "misc.c"
+#line 1642 "misc.c"
 			}
 		}
 	}
@@ -1651,7 +1648,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 	ids = (g_free (ids), NULL);
 #line 194 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1655 "misc.c"
+#line 1652 "misc.c"
 }
 
 
@@ -1695,7 +1692,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 	_atoms_size_ = atoms_length1;
 #line 199 "/home/jens/Source/shotwell/src/util/misc.vala"
 	ctr = 0;
-#line 1699 "misc.c"
+#line 1696 "misc.c"
 	{
 		GeeIterator* _current_media_it = NULL;
 		GeeCollection* _tmp4_ = NULL;
@@ -1708,7 +1705,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 		_current_media_it = _tmp5_;
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1712 "misc.c"
+#line 1709 "misc.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			MediaSource* current_media = NULL;
@@ -1730,7 +1727,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 			if (!_tmp7_) {
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1734 "misc.c"
+#line 1731 "misc.c"
 			}
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp8_ = _current_media_it;
@@ -1762,11 +1759,11 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 			_g_free0 (_tmp14_);
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_object_unref0 (current_media);
-#line 1766 "misc.c"
+#line 1763 "misc.c"
 		}
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_current_media_it);
-#line 1770 "misc.c"
+#line 1767 "misc.c"
 	}
 #line 203 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp17_ = media;
@@ -1798,7 +1795,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 	if (result_length1) {
 #line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*result_length1 = _tmp22__length1;
-#line 1802 "misc.c"
+#line 1799 "misc.c"
 	}
 #line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = _tmp22_;
@@ -1806,7 +1803,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 	atoms = (g_free (atoms), NULL);
 #line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1810 "misc.c"
+#line 1807 "misc.c"
 }
 
 
@@ -1839,14 +1836,14 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 	if (_tmp2_ <= ((gsize) 0)) {
 #line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = TRUE;
-#line 1843 "misc.c"
+#line 1840 "misc.c"
 	} else {
 		guchar* _tmp3_ = NULL;
 #line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = serialized;
 #line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 1850 "misc.c"
+#line 1847 "misc.c"
 	}
 #line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_) {
@@ -1854,7 +1851,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 		result = NULL;
 #line 213 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1858 "misc.c"
+#line 1855 "misc.c"
 	}
 #line 215 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp4_ = count;
@@ -1884,7 +1881,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 	_tmp10_ = atoms;
 #line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp10__length1 = atoms_length1;
-#line 1888 "misc.c"
+#line 1885 "misc.c"
 	{
 		GdkAtom* current_atom_collection = NULL;
 		gint current_atom_collection_length1 = 0;
@@ -1896,11 +1893,11 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 		current_atom_collection_length1 = _tmp10__length1;
 #line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
 		for (current_atom_it = 0; current_atom_it < _tmp10__length1; current_atom_it = current_atom_it + 1) {
-#line 1900 "misc.c"
+#line 1897 "misc.c"
 			GdkAtom current_atom = 0U;
 #line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
 			current_atom = current_atom_collection[current_atom_it];
-#line 1904 "misc.c"
+#line 1901 "misc.c"
 			{
 				MediaSource* media = NULL;
 				MediaCollectionRegistry* _tmp11_ = NULL;
@@ -1945,7 +1942,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_);
 #line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_g_object_unref0 (media);
-#line 1949 "misc.c"
+#line 1946 "misc.c"
 			}
 		}
 	}
@@ -1955,7 +1952,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 	atoms = (g_free (atoms), NULL);
 #line 225 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1959 "misc.c"
+#line 1956 "misc.c"
 }
 
 
@@ -1971,37 +1968,37 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 2005 "misc.c"
+#line 2002 "misc.c"
 }
 
 
@@ -2037,7 +2034,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 	_tmp3_ = _tmp2_.tm_year;
 #line 233 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_ == _tmp3_) {
-#line 2041 "misc.c"
+#line 2038 "misc.c"
 		gboolean _tmp4_ = FALSE;
 		struct tm _tmp5_ = {0};
 		gint _tmp6_ = 0;
@@ -2053,7 +2050,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 		_tmp8_ = _tmp7_.tm_mon;
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp6_ == _tmp8_) {
-#line 2057 "misc.c"
+#line 2054 "misc.c"
 			struct tm _tmp9_ = {0};
 			gint _tmp10_ = 0;
 			struct tm _tmp11_ = {0};
@@ -2068,15 +2065,15 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 			_tmp12_ = _tmp11_.tm_mday;
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp4_ = _tmp10_ == (_tmp12_ - 1);
-#line 2072 "misc.c"
+#line 2069 "misc.c"
 		} else {
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp4_ = FALSE;
-#line 2076 "misc.c"
+#line 2073 "misc.c"
 		}
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp4_) {
-#line 2080 "misc.c"
+#line 2077 "misc.c"
 			gchar* _tmp13_ = NULL;
 			gchar* _tmp14_ = NULL;
 #line 237 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2091,7 +2088,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 			_g_free0 (to_format);
 #line 238 "/home/jens/Source/shotwell/src/util/misc.vala"
 			to_format = _tmp14_;
-#line 2095 "misc.c"
+#line 2092 "misc.c"
 		} else {
 			gchar* _tmp15_ = NULL;
 			gchar* _tmp16_ = NULL;
@@ -2107,7 +2104,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 			_g_free0 (to_format);
 #line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 			to_format = _tmp16_;
-#line 2111 "misc.c"
+#line 2108 "misc.c"
 		}
 	} else {
 		gchar* _tmp17_ = NULL;
@@ -2124,7 +2121,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 		_g_free0 (to_format);
 #line 249 "/home/jens/Source/shotwell/src/util/misc.vala"
 		to_format = _tmp18_;
-#line 2128 "misc.c"
+#line 2125 "misc.c"
 	}
 #line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp19_ = from_format;
@@ -2160,7 +2157,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 	_g_free0 (from_format);
 #line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2164 "misc.c"
+#line 2161 "misc.c"
 }
 
 
@@ -2194,7 +2191,7 @@ gchar* format_local_date (struct tm* date) {
 	result = _tmp5_;
 #line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2198 "misc.c"
+#line 2195 "misc.c"
 }
 
 
@@ -2226,14 +2223,14 @@ OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar*
 	self->priv->callback_target = _tmp2__target;
 #line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return self;
-#line 2230 "misc.c"
+#line 2227 "misc.c"
 }
 
 
 OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target) {
 #line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return one_shot_scheduler_construct (TYPE_ONE_SHOT_SCHEDULER, name, callback, callback_target);
-#line 2237 "misc.c"
+#line 2234 "misc.c"
 }
 
 
@@ -2248,7 +2245,7 @@ gboolean one_shot_scheduler_is_scheduled (OneShotScheduler* self) {
 	result = _tmp0_ != ((guint) 0);
 #line 281 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2252 "misc.c"
+#line 2249 "misc.c"
 }
 
 
@@ -2257,7 +2254,7 @@ void one_shot_scheduler_at_idle (OneShotScheduler* self) {
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
 #line 285 "/home/jens/Source/shotwell/src/util/misc.vala"
 	one_shot_scheduler_at_priority_idle (self, G_PRIORITY_DEFAULT_IDLE);
-#line 2261 "misc.c"
+#line 2258 "misc.c"
 }
 
 
@@ -2266,7 +2263,7 @@ static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self
 	result = one_shot_scheduler_callback_wrapper ((OneShotScheduler*) self);
 #line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2270 "misc.c"
+#line 2267 "misc.c"
 }
 
 
@@ -2278,7 +2275,7 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority)
 	_tmp0_ = self->priv->scheduled;
 #line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_ == ((guint) 0)) {
-#line 2282 "misc.c"
+#line 2279 "misc.c"
 		gint _tmp1_ = 0;
 		guint _tmp2_ = 0U;
 #line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2287,7 +2284,7 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority)
 		_tmp2_ = g_idle_add_full (_tmp1_, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref);
 #line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
 		self->priv->scheduled = _tmp2_;
-#line 2291 "misc.c"
+#line 2288 "misc.c"
 	}
 }
 
@@ -2303,7 +2300,7 @@ void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gbool
 	_tmp1_ = reschedule;
 #line 294 "/home/jens/Source/shotwell/src/util/misc.vala"
 	one_shot_scheduler_priority_after_timeout (self, G_PRIORITY_DEFAULT, _tmp0_, _tmp1_);
-#line 2307 "misc.c"
+#line 2304 "misc.c"
 }
 
 
@@ -2320,35 +2317,35 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
 	_tmp1_ = self->priv->scheduled;
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_ != ((guint) 0)) {
-#line 2324 "misc.c"
+#line 2321 "misc.c"
 		gboolean _tmp2_ = FALSE;
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp2_ = reschedule;
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = !_tmp2_;
-#line 2330 "misc.c"
+#line 2327 "misc.c"
 	} else {
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = FALSE;
-#line 2334 "misc.c"
+#line 2331 "misc.c"
 	}
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_) {
 #line 299 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return;
-#line 2340 "misc.c"
+#line 2337 "misc.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp3_ = self->priv->scheduled;
 #line 301 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp3_ != ((guint) 0)) {
-#line 2346 "misc.c"
+#line 2343 "misc.c"
 		guint _tmp4_ = 0U;
 #line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = self->priv->scheduled;
 #line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_source_remove (_tmp4_);
-#line 2352 "misc.c"
+#line 2349 "misc.c"
 	}
 #line 304 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp5_ = priority;
@@ -2358,7 +2355,7 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
 	_tmp7_ = g_timeout_add_full (_tmp5_, _tmp6_, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref);
 #line 304 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->scheduled = _tmp7_;
-#line 2362 "misc.c"
+#line 2359 "misc.c"
 }
 
 
@@ -2373,7 +2370,7 @@ void one_shot_scheduler_cancel (OneShotScheduler* self) {
 	if (_tmp0_ == ((guint) 0)) {
 #line 309 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return;
-#line 2377 "misc.c"
+#line 2374 "misc.c"
 	}
 #line 311 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = self->priv->scheduled;
@@ -2381,7 +2378,7 @@ void one_shot_scheduler_cancel (OneShotScheduler* self) {
 	g_source_remove (_tmp1_);
 #line 312 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->scheduled = (guint) 0;
-#line 2385 "misc.c"
+#line 2382 "misc.c"
 }
 
 
@@ -2403,14 +2400,14 @@ static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self) {
 	result = FALSE;
 #line 319 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2407 "misc.c"
+#line 2404 "misc.c"
 }
 
 
 static void value_one_shot_scheduler_init (GValue* value) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	value->data[0].v_pointer = NULL;
-#line 2414 "misc.c"
+#line 2411 "misc.c"
 }
 
 
@@ -2419,7 +2416,7 @@ static void value_one_shot_scheduler_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		one_shot_scheduler_unref (value->data[0].v_pointer);
-#line 2423 "misc.c"
+#line 2420 "misc.c"
 	}
 }
 
@@ -2429,11 +2426,11 @@ static void value_one_shot_scheduler_copy_value (const GValue* src_value, GValue
 	if (src_value->data[0].v_pointer) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		dest_value->data[0].v_pointer = one_shot_scheduler_ref (src_value->data[0].v_pointer);
-#line 2433 "misc.c"
+#line 2430 "misc.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2437 "misc.c"
+#line 2434 "misc.c"
 	}
 }
 
@@ -2441,37 +2438,37 @@ static void value_one_shot_scheduler_copy_value (const GValue* src_value, GValue
 static gpointer value_one_shot_scheduler_peek_pointer (const GValue* value) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return value->data[0].v_pointer;
-#line 2445 "misc.c"
+#line 2442 "misc.c"
 }
 
 
 static gchar* value_one_shot_scheduler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (collect_values[0].v_pointer) {
-#line 2452 "misc.c"
+#line 2449 "misc.c"
 		OneShotScheduler* object;
 		object = collect_values[0].v_pointer;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2459 "misc.c"
+#line 2456 "misc.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2463 "misc.c"
+#line 2460 "misc.c"
 		}
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = one_shot_scheduler_ref (object);
-#line 2467 "misc.c"
+#line 2464 "misc.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2471 "misc.c"
+#line 2468 "misc.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return NULL;
-#line 2475 "misc.c"
+#line 2472 "misc.c"
 }
 
 
@@ -2482,25 +2479,25 @@ static gchar* value_one_shot_scheduler_lcopy_value (const GValue* value, guint n
 	if (!object_p) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2486 "misc.c"
+#line 2483 "misc.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (!value->data[0].v_pointer) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = NULL;
-#line 2492 "misc.c"
+#line 2489 "misc.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2496 "misc.c"
+#line 2493 "misc.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = one_shot_scheduler_ref (value->data[0].v_pointer);
-#line 2500 "misc.c"
+#line 2497 "misc.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return NULL;
-#line 2504 "misc.c"
+#line 2501 "misc.c"
 }
 
 
@@ -2514,7 +2511,7 @@ GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return G_PARAM_SPEC (spec);
-#line 2518 "misc.c"
+#line 2515 "misc.c"
 }
 
 
@@ -2523,7 +2520,7 @@ gpointer value_get_one_shot_scheduler (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER), NULL);
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return value->data[0].v_pointer;
-#line 2527 "misc.c"
+#line 2524 "misc.c"
 }
 
 
@@ -2543,17 +2540,17 @@ void value_set_one_shot_scheduler (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		one_shot_scheduler_ref (value->data[0].v_pointer);
-#line 2547 "misc.c"
+#line 2544 "misc.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2551 "misc.c"
+#line 2548 "misc.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (old) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		one_shot_scheduler_unref (old);
-#line 2557 "misc.c"
+#line 2554 "misc.c"
 	}
 }
 
@@ -2572,17 +2569,17 @@ void value_take_one_shot_scheduler (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = v_object;
-#line 2576 "misc.c"
+#line 2573 "misc.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2580 "misc.c"
+#line 2577 "misc.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (old) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		one_shot_scheduler_unref (old);
-#line 2586 "misc.c"
+#line 2583 "misc.c"
 	}
 }
 
@@ -2594,7 +2591,7 @@ static void one_shot_scheduler_class_init (OneShotSchedulerClass * klass) {
 	((OneShotSchedulerClass *) klass)->finalize = one_shot_scheduler_finalize;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_type_class_add_private (klass, sizeof (OneShotSchedulerPrivate));
-#line 2598 "misc.c"
+#line 2595 "misc.c"
 }
 
 
@@ -2605,7 +2602,7 @@ static void one_shot_scheduler_instance_init (OneShotScheduler * self) {
 	self->priv->scheduled = (guint) 0;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->ref_count = 1;
-#line 2609 "misc.c"
+#line 2606 "misc.c"
 }
 
 
@@ -2619,7 +2616,7 @@ static void one_shot_scheduler_finalize (OneShotScheduler* obj) {
 	one_shot_scheduler_cancel (self);
 #line 263 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_free0 (self->priv->name);
-#line 2623 "misc.c"
+#line 2620 "misc.c"
 }
 
 
@@ -2644,7 +2641,7 @@ gpointer one_shot_scheduler_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return instance;
-#line 2648 "misc.c"
+#line 2645 "misc.c"
 }
 
 
@@ -2657,7 +2654,7 @@ void one_shot_scheduler_unref (gpointer instance) {
 		ONE_SHOT_SCHEDULER_GET_CLASS (self)->finalize (self);
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2661 "misc.c"
+#line 2658 "misc.c"
 	}
 }
 
@@ -2680,14 +2677,14 @@ OpTimer* op_timer_construct (GType object_type, const gchar* name) {
 	self->priv->name = _tmp1_;
 #line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return self;
-#line 2684 "misc.c"
+#line 2681 "misc.c"
 }
 
 
 OpTimer* op_timer_new (const gchar* name) {
 #line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return op_timer_construct (TYPE_OP_TIMER, name);
-#line 2691 "misc.c"
+#line 2688 "misc.c"
 }
 
 
@@ -2699,7 +2696,7 @@ void op_timer_start (OpTimer* self) {
 	_tmp0_ = self->priv->timer;
 #line 336 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_timer_start (_tmp0_);
-#line 2703 "misc.c"
+#line 2700 "misc.c"
 }
 
 
@@ -2734,13 +2731,13 @@ void op_timer_stop (OpTimer* self) {
 	_tmp5_ = self->priv->shortest;
 #line 344 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp4_ < _tmp5_) {
-#line 2738 "misc.c"
+#line 2735 "misc.c"
 		gdouble _tmp6_ = 0.0;
 #line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = time;
 #line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
 		self->priv->shortest = _tmp6_;
-#line 2744 "misc.c"
+#line 2741 "misc.c"
 	}
 #line 347 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp7_ = time;
@@ -2748,19 +2745,19 @@ void op_timer_stop (OpTimer* self) {
 	_tmp8_ = self->priv->longest;
 #line 347 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp7_ > _tmp8_) {
-#line 2752 "misc.c"
+#line 2749 "misc.c"
 		gdouble _tmp9_ = 0.0;
 #line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp9_ = time;
 #line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
 		self->priv->longest = _tmp9_;
-#line 2758 "misc.c"
+#line 2755 "misc.c"
 	}
 #line 350 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp10_ = self->priv->count;
 #line 350 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->count = _tmp10_ + 1;
-#line 2764 "misc.c"
+#line 2761 "misc.c"
 }
 
 
@@ -2773,7 +2770,7 @@ gchar* op_timer_to_string (OpTimer* self) {
 	_tmp0_ = self->priv->count;
 #line 354 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_ > ((glong) 0)) {
-#line 2777 "misc.c"
+#line 2774 "misc.c"
 		const gchar* _tmp1_ = NULL;
 		glong _tmp2_ = 0L;
 		gdouble _tmp3_ = 0.0;
@@ -2802,7 +2799,7 @@ gchar* op_timer_to_string (OpTimer* self) {
 		result = _tmp8_;
 #line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 2806 "misc.c"
+#line 2803 "misc.c"
 	} else {
 		const gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
@@ -2814,7 +2811,7 @@ gchar* op_timer_to_string (OpTimer* self) {
 		result = _tmp10_;
 #line 358 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 2818 "misc.c"
+#line 2815 "misc.c"
 	}
 }
 
@@ -2822,7 +2819,7 @@ gchar* op_timer_to_string (OpTimer* self) {
 static void value_op_timer_init (GValue* value) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	value->data[0].v_pointer = NULL;
-#line 2826 "misc.c"
+#line 2823 "misc.c"
 }
 
 
@@ -2831,7 +2828,7 @@ static void value_op_timer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		op_timer_unref (value->data[0].v_pointer);
-#line 2835 "misc.c"
+#line 2832 "misc.c"
 	}
 }
 
@@ -2841,11 +2838,11 @@ static void value_op_timer_copy_value (const GValue* src_value, GValue* dest_val
 	if (src_value->data[0].v_pointer) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		dest_value->data[0].v_pointer = op_timer_ref (src_value->data[0].v_pointer);
-#line 2845 "misc.c"
+#line 2842 "misc.c"
 	} else {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2849 "misc.c"
+#line 2846 "misc.c"
 	}
 }
 
@@ -2853,37 +2850,37 @@ static void value_op_timer_copy_value (const GValue* src_value, GValue* dest_val
 static gpointer value_op_timer_peek_pointer (const GValue* value) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return value->data[0].v_pointer;
-#line 2857 "misc.c"
+#line 2854 "misc.c"
 }
 
 
 static gchar* value_op_timer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (collect_values[0].v_pointer) {
-#line 2864 "misc.c"
+#line 2861 "misc.c"
 		OpTimer* object;
 		object = collect_values[0].v_pointer;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2871 "misc.c"
+#line 2868 "misc.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.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 2875 "misc.c"
+#line 2872 "misc.c"
 		}
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = op_timer_ref (object);
-#line 2879 "misc.c"
+#line 2876 "misc.c"
 	} else {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2883 "misc.c"
+#line 2880 "misc.c"
 	}
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return NULL;
-#line 2887 "misc.c"
+#line 2884 "misc.c"
 }
 
 
@@ -2894,25 +2891,25 @@ static gchar* value_op_timer_lcopy_value (const GValue* value, guint n_collect_v
 	if (!object_p) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2898 "misc.c"
+#line 2895 "misc.c"
 	}
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (!value->data[0].v_pointer) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = NULL;
-#line 2904 "misc.c"
+#line 2901 "misc.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2908 "misc.c"
+#line 2905 "misc.c"
 	} else {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = op_timer_ref (value->data[0].v_pointer);
-#line 2912 "misc.c"
+#line 2909 "misc.c"
 	}
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return NULL;
-#line 2916 "misc.c"
+#line 2913 "misc.c"
 }
 
 
@@ -2926,7 +2923,7 @@ GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return G_PARAM_SPEC (spec);
-#line 2930 "misc.c"
+#line 2927 "misc.c"
 }
 
 
@@ -2935,7 +2932,7 @@ gpointer value_get_op_timer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER), NULL);
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return value->data[0].v_pointer;
-#line 2939 "misc.c"
+#line 2936 "misc.c"
 }
 
 
@@ -2955,17 +2952,17 @@ void value_set_op_timer (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		op_timer_ref (value->data[0].v_pointer);
-#line 2959 "misc.c"
+#line 2956 "misc.c"
 	} else {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2963 "misc.c"
+#line 2960 "misc.c"
 	}
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (old) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		op_timer_unref (old);
-#line 2969 "misc.c"
+#line 2966 "misc.c"
 	}
 }
 
@@ -2984,17 +2981,17 @@ void value_take_op_timer (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = v_object;
-#line 2988 "misc.c"
+#line 2985 "misc.c"
 	} else {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2992 "misc.c"
+#line 2989 "misc.c"
 	}
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (old) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		op_timer_unref (old);
-#line 2998 "misc.c"
+#line 2995 "misc.c"
 	}
 }
 
@@ -3006,7 +3003,7 @@ static void op_timer_class_init (OpTimerClass * klass) {
 	((OpTimerClass *) klass)->finalize = op_timer_finalize;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_type_class_add_private (klass, sizeof (OpTimerPrivate));
-#line 3010 "misc.c"
+#line 3007 "misc.c"
 }
 
 
@@ -3028,7 +3025,7 @@ static void op_timer_instance_init (OpTimer * self) {
 	self->priv->longest = DBL_MIN;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->ref_count = 1;
-#line 3032 "misc.c"
+#line 3029 "misc.c"
 }
 
 
@@ -3042,7 +3039,7 @@ static void op_timer_finalize (OpTimer* obj) {
 	_g_free0 (self->priv->name);
 #line 325 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_timer_destroy0 (self->priv->timer);
-#line 3046 "misc.c"
+#line 3043 "misc.c"
 }
 
 
@@ -3067,7 +3064,7 @@ gpointer op_timer_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return instance;
-#line 3071 "misc.c"
+#line 3068 "misc.c"
 }
 
 
@@ -3080,58 +3077,9 @@ void op_timer_unref (gpointer instance) {
 		OP_TIMER_GET_CLASS (self)->finalize (self);
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3084 "misc.c"
+#line 3081 "misc.c"
 	}
 }
 
 
-void suppress_warnings (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message) {
-#line 369 "/home/jens/Source/shotwell/src/util/misc.vala"
-	g_return_if_fail (message != NULL);
-#line 3092 "misc.c"
-}
-
-
-static void g_time_local (time_t time, struct tm* result) {
-	struct tm _result_ = {0};
-	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return;
-#line 3107 "misc.c"
-}
-
-
-gboolean is_twentyfour_hr_time_system (void) {
-	gboolean result = FALSE;
-	struct tm _tmp0_ = {0};
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	g_time_local ((time_t) 0, &_tmp0_);
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp1_ = g_time_format (&_tmp0_, "%p");
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp2_ = _tmp1_;
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp3_ = is_string_empty (_tmp2_);
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp4_ = _tmp3_;
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_g_free0 (_tmp2_);
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	result = _tmp4_;
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	return result;
-#line 3134 "misc.c"
-}
-
-
 
diff --git a/src/util/misc.vala b/src/util/misc.vala
index cc6a278..cbc6dfa 100644
--- a/src/util/misc.vala
+++ b/src/util/misc.vala
@@ -360,18 +360,3 @@ public class OpTimer {
     }
 }
 
-// Dummy function for suppressing 'could not stat file' errors
-// generated when saving into a previously non-existent file -
-// please see https://bugzilla.gnome.org/show_bug.cgi?id=662814
-// and to work around a spurious warning given by GDK when a
-// key press event is passed from a child class' event handler
-// to a parent's; (gnome bug pending, but see https://bugzilla.redhat.com/show_bug.cgi?id=665568).
-public void suppress_warnings(string? log_domain, LogLevelFlags log_levels, string message) {
-    // do nothing.
-}
-
-public bool is_twentyfour_hr_time_system() {
-    // if no AM/PM designation is found, the location is set to use a 24 hr time system
-    return is_string_empty(Time.local(0).format("%p"));
-}
-
diff --git a/src/util/string.c b/src/util/string.c
index ccf6504..4cfeedd 100644
--- a/src/util/string.c
+++ b/src/util/string.c
@@ -1,4 +1,4 @@
-/* string.c generated by valac 0.34.2, the Vala compiler
+/* string.c generated by valac 0.32.1, the Vala compiler
  * generated from string.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -65,15 +65,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 79 "string.c"
 }
@@ -614,19 +614,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 632 "string.c"
 }
@@ -639,25 +639,25 @@ static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar _tmp3_ = '\0';
-#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (delimiters != NULL, NULL);
-#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = delimiters;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = new_delimiter;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_strdelimit (_tmp1_, _tmp2_, _tmp3_);
-#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 663 "string.c"
 }
@@ -895,33 +895,33 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 913 "string.c"
 		gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 921 "string.c"
 	} else {
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 927 "string.c"
 	}
@@ -956,35 +956,35 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 976 "string.c"
 		gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 984 "string.c"
 	} else {
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = -1;
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 990 "string.c"
 	}
@@ -1031,103 +1031,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 1047 "string.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 1056 "string.c"
 	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 1062 "string.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 1071 "string.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 1077 "string.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 1086 "string.c"
 	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 1090 "string.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 1098 "string.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 1107 "string.c"
 	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 1111 "string.c"
 	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 1133 "string.c"
 }
@@ -1221,35 +1221,35 @@ static gint string_last_index_of (const gchar* self, const gchar* needle, gint s
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, 0);
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = needle;
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 1241 "string.c"
 		gchar* _tmp4_ = NULL;
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1249 "string.c"
 	} else {
-#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1255 "string.c"
 	}
@@ -1325,33 +1325,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 1343 "string.c"
 		gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1351 "string.c"
 	} else {
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1357 "string.c"
 	}
@@ -1392,15 +1392,15 @@ static gunichar string_get_char (const gchar* self, glong index) {
 	gunichar result = 0U;
 	glong _tmp0_ = 0L;
 	gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1116 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 1406 "string.c"
 }
@@ -1537,54 +1537,54 @@ static gboolean string_get_next_char (const gchar* self, gint* index, gunichar*
 	gint _tmp0_ = 0;
 	gunichar _tmp1_ = 0U;
 	gunichar _tmp2_ = 0U;
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = *index;
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_vala_c = _tmp1_;
-#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1107 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = _vala_c;
-#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1107 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp2_ != ((gunichar) 0)) {
 #line 1553 "string.c"
 		gint _tmp3_ = 0;
 		gchar* _tmp4_ = NULL;
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = *index;
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = g_utf8_next_char (((gchar*) self) + _tmp3_);
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		*index = (gint) (_tmp4_ - ((gchar*) self));
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = TRUE;
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (c) {
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			*c = _vala_c;
 #line 1568 "string.c"
 		}
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1572 "string.c"
 	} else {
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = FALSE;
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (c) {
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			*c = _vala_c;
 #line 1580 "string.c"
 		}
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 1584 "string.c"
 	}
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (c) {
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		*c = _vala_c;
 #line 1590 "string.c"
 	}
diff --git a/src/util/system.c b/src/util/system.c
index 8ab729d..cef9603 100644
--- a/src/util/system.c
+++ b/src/util/system.c
@@ -1,4 +1,4 @@
-/* system.c generated by valac 0.34.2, the Vala compiler
+/* system.c generated by valac 0.32.1, 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 56a355a..ee1017e 100644
--- a/src/util/ui.c
+++ b/src/util/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.34.2, the Vala compiler
+/* ui.c generated by valac 0.32.1, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.